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

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

Author: ccaillet-guest
Date: Thu Aug 12 21:50:29 2010
New Revision: 826

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=826
Log:
FIX: small fix with prototypes and use definitions

Modified:
    branches/next-gen/lib/PFTools/Update.pm
    branches/next-gen/lib/PFTools/Update/Installpkg.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=826&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update.pm (original)
+++ branches/next-gen/lib/PFTools/Update.pm Thu Aug 12 21:50:29 2010
@@ -42,6 +42,8 @@
 use File::Compare;
 use File::Copy;
 use PFTools::Update::Common;
+use PFTools::Update::Addfile;
+use PFTools::Update::Installpkg;
 use PFTools::Logger;
 use PFTools::Parser;
 use PFTools::Net;
@@ -51,15 +53,15 @@
 use Fcntl ':mode';
 
 #Librairies Debconf
-use Debconf::Db;
-use Debconf::Template;
-use Debconf::ConfModule;
-
-###########################################
-### Environement vars
-$ENV{'PATH'}            = $ENV{'PATH'} . ":/usr/local/sbin:/usr/local/bin";
-$ENV{'DEBIAN_FRONTEND'} = "noninteractive";
-$ENV{'DEBIAN_PRIORITY'} = "critical";
+# use Debconf::Db;
+# use Debconf::Template;
+# use Debconf::ConfModule;
+# 
+# ###########################################
+# ### Environement vars
+# $ENV{'PATH'}            = $ENV{'PATH'} . ":/usr/local/sbin:/usr/local/bin";
+# $ENV{'DEBIAN_FRONTEND'} = "noninteractive";
+# $ENV{'DEBIAN_PRIORITY'} = "critical";
 
 my $STARTTIME = time();
 
@@ -215,17 +217,17 @@
 	return 0;
 };
 
-sub aptupdate ($){
-	my ( $pkg_type ) = @_;
-
-	if ( $APT_UPDATE ) {
-		if ( ! Update_pkg_repository ( $pkg_type ) ) {
-			return 1;
-		}
-		$APT_UPDATE = 0;
-	}
-	return 0;
-}
+# sub aptupdate ($){
+# 	my ( $pkg_type ) = @_;
+# 
+# 	if ( $APT_UPDATE ) {
+# 		if ( ! Update_pkg_repository ( $pkg_type ) ) {
+# 			return 1;
+# 		}
+# 		$APT_UPDATE = 0;
+# 	}
+# 	return 0;
+# }
 
 # $DEPENDS{'apt-get'} = sub ($$$) {
 #     my ( $ref_section, $dest, $options ) = @_;

Modified: branches/next-gen/lib/PFTools/Update/Installpkg.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Update/Installpkg.pm?rev=826&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update/Installpkg.pm (original)
+++ branches/next-gen/lib/PFTools/Update/Installpkg.pm Thu Aug 12 21:50:29 2010
@@ -39,6 +39,18 @@
 use PFTools::Logger;
 use PFTools::Conf;
 use PFTools::Update::Common;
+#Librairies Debconf
+use Debconf::Db;
+use Debconf::Template;
+use Debconf::ConfModule;
+
+###########################################
+### Environement vars
+$ENV{'PATH'}            = $ENV{'PATH'} . ":/usr/local/sbin:/usr/local/bin";
+$ENV{'DEBIAN_FRONTEND'} = "noninteractive";
+$ENV{'DEBIAN_PRIORITY'} = "critical";
+
+
 
 sub Insallpkg_depends ($$$) {
     my ( $ref_section, $dest, $options ) = @_;
@@ -57,7 +69,7 @@
 	}
 }
 
-sub Installpkg_action ($$$$) {
+sub Installpkg_action ($$$$$) {
     my ( $ref_section, $dest, $options, $hash_subst, $global_config ) = @_;
 
     $options->{'pkg_type'} = 'deb' if ( ! defined $options->{'pkg_type'} ) ;