pf-tools commit: r828 [ccaillet-guest] - /branches/next-gen/lib/PFTools/Update.pm

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

Author: ccaillet-guest
Date: Thu Aug 12 21:56:16 2010
New Revision: 828

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=828
Log:
FIX: avoid redefinition of dirname function between Update.pm and Update::Common.pm

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

Modified: branches/next-gen/lib/PFTools/Update.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Update.pm?rev=828&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update.pm (original)
+++ branches/next-gen/lib/PFTools/Update.pm Thu Aug 12 21:56:16 2010
@@ -33,8 +33,7 @@
 our @EXPORT = qw(
 	Get_depends_for_action
 	Exec_action
-    Trie_dependances
-    dirname
+	Trie_dependances
 );
 
 our @EXPORT_OK = qw();
@@ -67,12 +66,12 @@
 
 ###########################################
 ### Constants
-my $DEFAULT_FSTYPE  = 'nfs';
-my $DEFAULT_OPTIONS = 'defaults,noexec,nosuid,nodev,hard,intr';
+my $DEFAULT_FSTYPE	= 'nfs';
+my $DEFAULT_OPTIONS	= 'defaults,noexec,nosuid,nodev,hard,intr';
+my $APT_UPDATE		= 1;
 # my $APT_GET         = 'LANG=C LC_ALL=C /usr/bin/apt-get -y --force-yes';
 # my $APT_GET_DEPENDS = 'LANG=C LC_ALL=C /usr/bin/apt-get -y --force-yes -s -u';
 # my $APT_POLICY      = 'LANG=C LC_ALL=C /usr/bin/apt-cache policy';
-my $APT_UPDATE      = 1;
 # my $DPKG            = 'LANG=C LC_ALL=C /usr/bin/dpkg';
 
 # Fonctions utilisees dans les fichiers de conf