pf-tools commit: r727 [ccaillet-guest] - in /trunk: debian/changelog lib/PFTools/Update.pm

[parmelan-guest at users.alioth.debian.org]

Author: ccaillet-guest
Date: Mon Dec  7 15:44:08 2009
New Revision: 727

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=727
Log:
* lib/PFTools/Update.pm (forward-port from branches/0.33-stable r726) 
  - Get_conf: sort readdir result, in order to always read update-hostname
    before update-hostname01 (thus allowing to ignore in update-hostname01 a
    section defined in update-hostname).

Modified:
    trunk/debian/changelog
    trunk/lib/PFTools/Update.pm

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=727&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Mon Dec  7 15:44:08 2009
@@ -51,6 +51,10 @@
   * filters/filter_vlan2if : substitution occured with POPNAME keyword
     according to the value extracted from host parameter (backported from branche
     0.33-stable)
+  * lib/PFTools/Update.pm (forward-port from branches/0.33-stable r726) 
+    - Get_conf: sort readdir result, in order to always read update-hostname
+      before update-hostname01 (thus allowing to ignore in update-hostname01 a
+      section defined in update-hostname).
 
   [ Thomas Parmelan ]
   * debian/control
@@ -72,7 +76,7 @@
   * tools/kvmlaunch:
     - new script.
 
- -- Christophe Caillet <quadchris at free.fr>  Tue, 01 Dec 2009 14:25:12 +0100
+ -- Christophe Caillet <quadchris at free.fr>  Mon, 07 Dec 2009 16:42:19 +0100
 
 pf-tools (0.33.1-1) unstable; urgency=low
 

Modified: trunk/lib/PFTools/Update.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Update.pm?rev=727&op=diff
==============================================================================
--- trunk/lib/PFTools/Update.pm (original)
+++ trunk/lib/PFTools/Update.pm Mon Dec  7 15:44:08 2009
@@ -1853,7 +1853,7 @@
     $template = "update-" . $1 . "(" . $2 . "|" . $2 . $3 . ")?";
 
     opendir( CONFIG, Get_source("GLOBAL:") );
-    foreach $conf ( $COMMON, grep ( /^$template$/, readdir(CONFIG) ) ) {
+    foreach $conf ( $COMMON, sort grep ( /^$template$/, readdir(CONFIG) ) ) {
 	my $c = Load_conf( Get_source( "GLOBAL:" . $conf ), 1 );
 	foreach ( keys %$c ) {
 	    if ( $c->{$_}->{'action'} eq 'ignore' && !defined( $C->{$_} ) ) {