[Openvas-commits] r5354 - trunk/tools/openvas-lsc-target-preparation

[scm-commit@wald.intevation.org]

Author: felix
Date: 2009-10-02 12:27:35 +0200 (Fri, 02 Oct 2009)
New Revision: 5354

Modified:
   trunk/tools/openvas-lsc-target-preparation/Changelog
   trunk/tools/openvas-lsc-target-preparation/MANIFEST
   trunk/tools/openvas-lsc-target-preparation/Makefile
Log:
Fixed a bug. Output of ls differs in ordering depending on the locale.
In the Makefile, the diff command compares ls output with MANIFEST,
leading to wrong results if these files are sorted differently.
Found in cooperation with Matthew Mundell.

* MANIFEST: Sorted "traditionally".

* Makefile: Set locale to have the ls command sort "traditionally".


Modified: trunk/tools/openvas-lsc-target-preparation/Changelog
===================================================================
--- trunk/tools/openvas-lsc-target-preparation/Changelog	2009-10-01 20:44:47 UTC (rev 5353)
+++ trunk/tools/openvas-lsc-target-preparation/Changelog	2009-10-02 10:27:35 UTC (rev 5354)
@@ -1,3 +1,14 @@
+2009-10-02  Felix Wolfsteller <felix.wolfsteller at intevation.de>
+
+	Fixed a bug. Output of ls differs in ordering depending on the locale.
+	In the Makefile, the diff command compares ls output with MANIFEST,
+	leading to wrong results if these files are sorted differently.
+	Found in cooperation with Matthew Mundell.
+
+	* MANIFEST: Sorted "traditionally".
+
+	* Makefile: Set locale to have the ls command sort "traditionally".
+
 2009-09-23  Felix Wolfsteller <felix.wolfsteller at intevation.de>
 
 	* create-rpm.sh: Fixed bashism.

Modified: trunk/tools/openvas-lsc-target-preparation/MANIFEST
===================================================================
--- trunk/tools/openvas-lsc-target-preparation/MANIFEST	2009-10-01 20:44:47 UTC (rev 5353)
+++ trunk/tools/openvas-lsc-target-preparation/MANIFEST	2009-10-02 10:27:35 UTC (rev 5354)
@@ -1,14 +1,14 @@
 Changelog
-configure
-create-rpm.sh
-lsc-pubkey.pub
+MANIFEST
 Makefile
-makeself-2.1.5
-MANIFEST
 NAME
-openvas-lsc-target.spec.in
 PUBKEYNAME
 README
 RPMBASENAME
 TODO
 VERSION
+configure
+create-rpm.sh
+lsc-pubkey.pub
+makeself-2.1.5
+openvas-lsc-target.spec.in
\ No newline at end of file

Modified: trunk/tools/openvas-lsc-target-preparation/Makefile
===================================================================
--- trunk/tools/openvas-lsc-target-preparation/Makefile	2009-10-01 20:44:47 UTC (rev 5353)
+++ trunk/tools/openvas-lsc-target-preparation/Makefile	2009-10-02 10:27:35 UTC (rev 5354)
@@ -23,7 +23,7 @@
 	cp lsc-pubkey.pub $(RPM_BUILD_ROOT)/home/$(PUBKEYNAME)/.ssh/authorized_keys
 
 clean:
-	ls | egrep -v "\.spec" | diff  MANIFEST - | grep "^>" | sed 's/^..//' | xargs rm -rf
+	LC_ALL=C ls | egrep -v "\.spec" | diff  MANIFEST - | grep "^>" | sed 's/^..//' | xargs rm -rf
 
 # The default pubkey is used as an example, to test the building
 # system locally. An RPM should be generated.