pf-tools commit: r858 [ccaillet-guest] - in /branches/next-gen/lib/PFTools: Compat/Parser.pm Conf.pm Parser.pm Structqueries.pm Update/Addfile.pm Update/Addlink.pm Update/Addmount.pm Update/Common.pm Update/Createfile.pm Update/Installpkg.pm
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Fri Aug 27 15:07:02 UTC 2010
Author: ccaillet-guest
Date: Fri Aug 27 15:07:01 2010
New Revision: 858
URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=858
Log:
More code cleaning especially in use
Modified:
branches/next-gen/lib/PFTools/Compat/Parser.pm
branches/next-gen/lib/PFTools/Conf.pm
branches/next-gen/lib/PFTools/Parser.pm
branches/next-gen/lib/PFTools/Structqueries.pm
branches/next-gen/lib/PFTools/Update/Addfile.pm
branches/next-gen/lib/PFTools/Update/Addlink.pm
branches/next-gen/lib/PFTools/Update/Addmount.pm
branches/next-gen/lib/PFTools/Update/Common.pm
branches/next-gen/lib/PFTools/Update/Createfile.pm
branches/next-gen/lib/PFTools/Update/Installpkg.pm
Modified: branches/next-gen/lib/PFTools/Compat/Parser.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Compat/Parser.pm?rev=858&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Compat/Parser.pm (original)
+++ branches/next-gen/lib/PFTools/Compat/Parser.pm Fri Aug 27 15:07:01 2010
@@ -34,7 +34,6 @@
our @EXPORT_OK = qw();
use PFTools::Logger;
-use PFTools::Parser;
###################################################
########
@@ -78,6 +77,14 @@
}
}
+# Subst_vars
+sub Subst_vars ($$) {
+ my ( $str, $hash_subst ) = @_;
+
+ $str =~ s/%([^\%]+)%/$hash_subst->{$1}/gm;
+ return $str;
+}
+
my $PFTOOLS_VARS = {};
sub Parser_pftools ($$) {
Modified: branches/next-gen/lib/PFTools/Conf.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Conf.pm?rev=858&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Conf.pm (original)
+++ branches/next-gen/lib/PFTools/Conf.pm Fri Aug 27 15:07:01 2010
@@ -41,6 +41,7 @@
our @ISA = ('Exporter');
our @EXPORT = qw(
+ Subst_vars
Init_SUBST
Init_PF_CONFIG
Init_GLOBAL_NETCONFIG
@@ -124,6 +125,14 @@
'site' => '',
'zone' => ''
};
+
+# Subst_vars
+sub Subst_vars ($$) {
+ my ( $str, $hash_subst ) = @_;
+
+ $str =~ s/%([^\%]+)%/$hash_subst->{$1}/gm;
+ return $str;
+}
sub Init_PF_CONFIG (;$) {
my ( $config_file ) = @_;
Modified: branches/next-gen/lib/PFTools/Parser.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Parser.pm?rev=858&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Parser.pm (original)
+++ branches/next-gen/lib/PFTools/Parser.pm Fri Aug 27 15:07:01 2010
@@ -27,7 +27,6 @@
our @ISA = ('Exporter');
our @EXPORT = qw(
- Subst_vars
Parser_ini
);
@@ -40,14 +39,6 @@
### Constants
my $DEBUG = 0;
-
-# Subst_vars
-sub Subst_vars ($$) {
- my ( $str, $hash_subst ) = @_;
-
- $str =~ s/%([^\%]+)%/$hash_subst->{$1}/gm;
- return $str;
-}
sub Parser_ini ($) {
my ( $file ) = @_;
Modified: branches/next-gen/lib/PFTools/Structqueries.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Structqueries.pm?rev=858&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Structqueries.pm (original)
+++ branches/next-gen/lib/PFTools/Structqueries.pm Fri Aug 27 15:07:01 2010
@@ -26,7 +26,7 @@
use warnings;
use Exporter;
-use PFTools::Parser;
+# use PFTools::Parser;
use PFTools::Logger;
use Data::Dumper;
Modified: branches/next-gen/lib/PFTools/Update/Addfile.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Update/Addfile.pm?rev=858&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update/Addfile.pm (original)
+++ branches/next-gen/lib/PFTools/Update/Addfile.pm Fri Aug 27 15:07:01 2010
@@ -37,7 +37,6 @@
use File::Copy;
use Text::Diff;
use PFTools::Logger;
-use PFTools::Parser;
use PFTools::Conf;
use PFTools::Update::Common;
@@ -110,7 +109,6 @@
}
if ( $options->{'diff'} ) {
print diff ( $dest, $tmp, { STYLE => "Unified" } );
-# deferredlogsystem( "/usr/bin/diff -uN '".$dest."' '".$tmp."'" );
}
Do_on_config( $ref_section, $options, $hash_subst ) && return 1;
Do_before_change ( $ref_section, $options, $hash_subst ) && return 1;
Modified: branches/next-gen/lib/PFTools/Update/Addlink.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Update/Addlink.pm?rev=858&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update/Addlink.pm (original)
+++ branches/next-gen/lib/PFTools/Update/Addlink.pm Fri Aug 27 15:07:01 2010
@@ -33,9 +33,8 @@
our @EXPORT_OK = qw();
-use PFTools::Parser;
+use PFTools::Conf;
use PFTools::Logger;
-use PFTools::Conf;
use PFTools::Update::Common;
sub Addlink_depends ($$$) {
Modified: branches/next-gen/lib/PFTools/Update/Addmount.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Update/Addmount.pm?rev=858&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update/Addmount.pm (original)
+++ branches/next-gen/lib/PFTools/Update/Addmount.pm Fri Aug 27 15:07:01 2010
@@ -33,7 +33,6 @@
our @EXPORT_OK = qw();
-use File::Compare;
use File::Copy;
use Text::Diff;
use PFTools::Parser;
Modified: branches/next-gen/lib/PFTools/Update/Common.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Update/Common.pm?rev=858&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update/Common.pm (original)
+++ branches/next-gen/lib/PFTools/Update/Common.pm Fri Aug 27 15:07:01 2010
@@ -43,11 +43,9 @@
our @EXPORT_OK = qw();
-use File::Compare;
-use File::Copy;
use PFTools::Logger;
use PFTools::Conf;
-use PFTools::Parser;
+use File::Copy;
use Fcntl ':mode';
Modified: branches/next-gen/lib/PFTools/Update/Createfile.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Update/Createfile.pm?rev=858&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update/Createfile.pm (original)
+++ branches/next-gen/lib/PFTools/Update/Createfile.pm Fri Aug 27 15:07:01 2010
@@ -33,10 +33,8 @@
our @EXPORT_OK = qw();
-use File::Compare;
use File::Copy;
use PFTools::Logger;
-use PFTools::Parser;
use PFTools::Conf;
use PFTools::Update::Common;
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=858&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update/Installpkg.pm (original)
+++ branches/next-gen/lib/PFTools/Update/Installpkg.pm Fri Aug 27 15:07:01 2010
@@ -33,9 +33,6 @@
our @EXPORT_OK = qw();
-use File::Compare;
-use File::Copy;
-use Text::Diff;
use PFTools::Logger;
use PFTools::Conf;
use PFTools::Packages;
More information about the pf-tools-commits
mailing list