fix 4bb90e3

qgis · Jun 10, 2015 · 86a4820f48d4922ed338a65e99f73886ff54eefb · 86a4820
1 parent 4bb90e3
commit 86a4820f48d4922ed338a65e99f73886ff54eefb
Unified Split

Showing with 5 additions and 9 deletions.

+5 −9 scripts/sort_includes.pl
diff --git a/scripts/sort_includes.pl b/scripts/sort_includes.pl
@@ -26,13 +26,7 @@
 our $sorting;
 
 BEGIN { $sorting = 0; }
-END {
-	if( $sorting ) {
-		print foreach sort keys %uis;
-		print foreach sort keys %sys;
-		print foreach sort keys %others;
-	}
-}
+END { die "header files not empty" if keys %uis || keys %sys || keys %others; }
 
 if(/^\s*#include/ ) {
 	if(/"ui_/ ) {
@@ -43,7 +37,8 @@ END
 		$others{$_}=1;
 	}
 	$sorting=1;
-	next;
+
+	next unless eof;
 }
 
 if( $sorting ) {
@@ -54,8 +49,9 @@ END
 	undef %uis;
 	undef %sys;
 	undef %others;
-}
 
+	last if eof;
+}
 
 $sorting=0;