pf-tools commit: r839 [ccaillet-guest] - in /branches/next-gen: debian/changelog lib/PFTools/Update.pm

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

Author: ccaillet-guest
Date: Tue Aug 24 11:51:16 2010
New Revision: 839

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=839
Log:
privatizing __Trie_prio and fix for action installpkg or purgepkg

Modified:
    branches/next-gen/debian/changelog
    branches/next-gen/lib/PFTools/Update.pm

Modified: branches/next-gen/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/debian/changelog?rev=839&op=diff
==============================================================================
--- branches/next-gen/debian/changelog (original)
+++ branches/next-gen/debian/changelog Tue Aug 24 11:51:16 2010
@@ -20,6 +20,7 @@
     - fix on Ini_TOOLS : if storable file doesn't exist we need to parse
   * lib/PFTools/Update.pm
     - splitting $FUNCTION and $DEPENDS to perl package under PFTools::Update::*
+    - privatizing __Trie_prio and fix for action installpkg or purgepkg
   * lib/PFTools/Update/Common.pm
     - extracting common functions from Update.pm which are used by $FUNCTION
     and $DEPENDS in lib/PFTools/Update.pm
@@ -48,7 +49,7 @@
   * doc/updatefile-syntax
     - basic documentation about update file
 
- -- Christophe Caillet <quadchris at free.fr>  Tue, 24 Aug 2010 08:21:24 +0200
+ -- Christophe Caillet <quadchris at free.fr>  Tue, 24 Aug 2010 10:42:50 +0200
 
 pf-tools (0.99.98-1) unstable; urgency=low
 

Modified: branches/next-gen/lib/PFTools/Update.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Update.pm?rev=839&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update.pm (original)
+++ branches/next-gen/lib/PFTools/Update.pm Tue Aug 24 11:51:16 2010
@@ -110,7 +110,7 @@
 	return Removedir_action ( $ref_section, $dest, $options, $hash_subst, $global_config ) if ( $action eq "removedir" );
 }
 
-sub Trie_prio {
+sub __Trie_prio {
 	my ( $host_config, $section ) = @_;
 
 	my $prio	= 0;
@@ -137,9 +137,9 @@
 	$prio++;
 	return $prio if ( $section eq "pf-tools" );
 	$prio++;
-	return $prio if ( $action eq "dpkg-purge" );
+	return $prio if ( $action eq "dpkg-purge" || $action eq "purgepkg" );
     $prio++;
-    return $prio if ( $action eq "apt-get" );
+    return $prio if ( $action eq "apt-get" || $action eq "installpkg" );
     $prio++;
 
 	# Fourth : creations and adds for files and links
@@ -161,8 +161,8 @@
 sub Trie_dependances {
     my ( $host_config, $a, $b ) = @_;
 
-    my $prioa = Trie_prio ( $host_config, $a );
-    my $priob = Trie_prio( $host_config, $b );
+    my $prioa = __Trie_prio ( $host_config, $a );
+    my $priob = __Trie_prio( $host_config, $b );
 
     if ( $prioa != $priob ) {
 		return $prioa <=> $priob;