summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArvid Picciani <aep@hereticlinux.org>2010-06-29 11:48:35 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2010-06-29 11:48:35 (GMT)
commit704f8c2ccde7a01d5ecc6c13ff5cc1d5f5b09519 (patch)
tree5c1f86632e73297310bf5403678b525384a61711
parentd3f6e14066219a957f48d24e9f39d3d0c5a61f53 (diff)
downloadQt-704f8c2ccde7a01d5ecc6c13ff5cc1d5f5b09519.zip
Qt-704f8c2ccde7a01d5ecc6c13ff5cc1d5f5b09519.tar.gz
Qt-704f8c2ccde7a01d5ecc6c13ff5cc1d5f5b09519.tar.bz2
syncqt: abort on permission error writing to include/Qt
Merge-request: 707 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rwxr-xr-xbin/syncqt6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/syncqt b/bin/syncqt
index f499bbc..11b1d72 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -834,12 +834,12 @@ foreach (@modules_to_sync) {
# write forwarding headers to include/Qt
if ("$lib" ne "phonon" && "$subdir" =~ /^$basedir\/src/) {
my $file_name = "$out_basedir/include/Qt/$header";
+ my $file_op = '>';
my $header_content = '';
if (exists $colliding_headers{$file_name}) {
- $file_name = ">>$file_name";
+ $file_op = '>>';
} else {
$colliding_headers{$file_name} = 1;
- $file_name = ">$file_name";
my $warning_msg = 'Inclusion of header files from include/Qt is deprecated.';
$header_content = "#ifndef QT_NO_QT_INCLUDE_WARN\n" .
" #if defined(__GNUC__)\n" .
@@ -850,7 +850,7 @@ foreach (@modules_to_sync) {
"#endif\n\n";
}
$header_content .= '#include "' . "../$lib/$header" . "\"\n";
- open HEADERFILE, $file_name;
+ open HEADERFILE, $file_op, $file_name or die "unable to open '$file_name' : $!\n";
print HEADERFILE $header_content;
close HEADERFILE;
}