pf-tools commit: r726 [parmelan-guest] - in /branches/0.33-stable: debian/changelog lib/PFTools/Update.pm

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

Author: parmelan-guest
Date: Mon Dec  7 15:33:08 2009
New Revision: 726

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=726
Log:
* lib/PFTools/Update.pm
  - 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:
    branches/0.33-stable/debian/changelog
    branches/0.33-stable/lib/PFTools/Update.pm

Modified: branches/0.33-stable/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/debian/changelog?rev=726&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Mon Dec  7 15:33:08 2009
@@ -19,8 +19,12 @@
     - always keep eth0 first in the list of network interfaces on the kvm
       command line, otherwiser DHCP requests will go out on the wrong
       interface.
-
- -- Christophe Caillet <quadchris at free.fr>  Tue, 01 Dec 2009 14:18:57 +0100
+  * lib/PFTools/Update.pm
+    - 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 <tom+pf-tools at ankh.fr.EU.org>  Mon, 07 Dec 2009 16:28:38 +0100
 
 pf-tools (0.33.18-1) unstable; urgency=low
 

Modified: branches/0.33-stable/lib/PFTools/Update.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/lib/PFTools/Update.pm?rev=726&op=diff
==============================================================================
--- branches/0.33-stable/lib/PFTools/Update.pm (original)
+++ branches/0.33-stable/lib/PFTools/Update.pm Mon Dec  7 15:33:08 2009
@@ -1869,7 +1869,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'} and $c->{$_}->{'action'} eq 'ignore' && !defined( $C->{$_} ) ) {