pf-tools commit: r884 [parmelan-guest] - in /branches/next-gen: ./ filters/ lib/PFTools/ lib/PFTools/Compat/ lib/PFTools/Conf/ lib/PFTools/Update/ sbin/ tools/
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Tue Sep 7 10:08:21 UTC 2010
Author: parmelan-guest
Date: Tue Sep 7 10:08:17 2010
New Revision: 884
URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=884
Log:
Reorder use XXX; statements
Modified:
branches/next-gen/README.coding.style
branches/next-gen/filters/filter_distrib (contents, props changed)
branches/next-gen/filters/filter_privateresolve (contents, props changed)
branches/next-gen/filters/filter_vlan2if (contents, props changed)
branches/next-gen/lib/PFTools/Bridge.pm
branches/next-gen/lib/PFTools/Compat/Parser.pm
branches/next-gen/lib/PFTools/Compat/Translation.pm
branches/next-gen/lib/PFTools/Conf.pm
branches/next-gen/lib/PFTools/Conf/Host.pm
branches/next-gen/lib/PFTools/Conf/Network.pm
branches/next-gen/lib/PFTools/Conf/Syntax.pm
branches/next-gen/lib/PFTools/Disk.pm
branches/next-gen/lib/PFTools/Net.pm
branches/next-gen/lib/PFTools/Packages.pm
branches/next-gen/lib/PFTools/Parser.pm
branches/next-gen/lib/PFTools/Structqueries.pm
branches/next-gen/lib/PFTools/Update.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
branches/next-gen/lib/PFTools/Update/Mkdir.pm
branches/next-gen/lib/PFTools/Update/Purgepkg.pm
branches/next-gen/lib/PFTools/Update/Removedir.pm
branches/next-gen/lib/PFTools/Update/Removefile.pm
branches/next-gen/lib/PFTools/Utils.pm
branches/next-gen/lib/PFTools/VCS.pm
branches/next-gen/sbin/fix_hosts (contents, props changed)
branches/next-gen/sbin/mk_dhcp (contents, props changed)
branches/next-gen/sbin/mk_grubopt (contents, props changed)
branches/next-gen/sbin/mk_interfaces (contents, props changed)
branches/next-gen/sbin/mk_pxelinuxcfg (contents, props changed)
branches/next-gen/sbin/mk_resolvconf (contents, props changed)
branches/next-gen/sbin/mk_sitezone
branches/next-gen/sbin/mk_sourceslist (contents, props changed)
branches/next-gen/sbin/update-config (contents, props changed)
branches/next-gen/tools/Display_IP_config
branches/next-gen/tools/Translate_old_config (contents, props changed)
branches/next-gen/tools/dumpiplist.pl (contents, props changed)
branches/next-gen/tools/pflaunch (contents, props changed)
branches/next-gen/tools/umlaunch (contents, props changed)
branches/next-gen/tools/xenlaunch (contents, props changed)
Modified: branches/next-gen/README.coding.style
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/README.coding.style?rev=884&op=diff
==============================================================================
--- branches/next-gen/README.coding.style (original)
+++ branches/next-gen/README.coding.style Tue Sep 7 10:08:17 2010
@@ -1,3 +1,4 @@
+
To improve things in pf-tools, we'll be slowly implementing more and
more Perl Best Practices (go read it, it's really worth it!) in the
future. The following are just a beginning:
@@ -9,3 +10,7 @@
- use warnings;
- use English qw( -no_match_vars ); # Avoids regex performance penalty
+* "use XXX;" statements should be alphabetically sorted (unless there is a
+ good reason not to do so), and separated in two groups: first the standard
+ packages, then a new line and our own packages.
+
Modified: branches/next-gen/filters/filter_distrib
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/filters/filter_distrib?rev=884&op=diff
==============================================================================
--- branches/next-gen/filters/filter_distrib (original)
+++ branches/next-gen/filters/filter_distrib Tue Sep 7 10:08:17 2010
@@ -22,12 +22,13 @@
use strict;
use warnings;
-use PFTools::Utils;
+use English qw( -no_match_vars ); # Avoids regex performance penalty
+use Getopt::Long qw( :config ignore_case_always bundling );
+use Sys::Hostname;
+
use PFTools::Logger;
use PFTools::Structqueries;
-use Getopt::Long qw( :config ignore_case_always bundling );
-use English qw( -no_match_vars ); # Avoids regex performance penalty
-use Sys::Hostname;
+use PFTools::Utils;
#################################
# VARS
Modified: branches/next-gen/filters/filter_privateresolve
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/filters/filter_privateresolve?rev=884&op=diff
==============================================================================
--- branches/next-gen/filters/filter_privateresolve (original)
+++ branches/next-gen/filters/filter_privateresolve Tue Sep 7 10:08:17 2010
@@ -24,12 +24,13 @@
use strict;
use warnings;
+use English qw( -no_match_vars ); # Avoids regex performance penalty
+use Getopt::Long qw( :config ignore_case_always bundling );
+use Sys::Hostname;
+
+use PFTools::Logger;
+use PFTools::Structqueries;
use PFTools::Utils;
-use PFTools::Structqueries;
-use PFTools::Logger;
-use Getopt::Long qw( :config ignore_case_always bundling );
-use English qw( -no_match_vars ); # Avoids regex performance penalty
-use Sys::Hostname;
#################################
# VARS
Modified: branches/next-gen/filters/filter_vlan2if
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/filters/filter_vlan2if?rev=884&op=diff
==============================================================================
--- branches/next-gen/filters/filter_vlan2if (original)
+++ branches/next-gen/filters/filter_vlan2if Tue Sep 7 10:08:17 2010
@@ -27,12 +27,13 @@
use strict;
use warnings;
-use PFTools::Utils;
+use English qw( -no_match_vars ); # Avoids regex performance penalty
+use Getopt::Long qw( :config ignore_case_always bundling );
+use Sys::Hostname;
+
use PFTools::Logger;
use PFTools::Structqueries;
-use Getopt::Long qw( :config ignore_case_always bundling );
-use English qw( -no_match_vars ); # Avoids regex performance penalty
-use Sys::Hostname;
+use PFTools::Utils;
#################################
# VARS
Modified: branches/next-gen/lib/PFTools/Bridge.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Bridge.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Bridge.pm (original)
+++ branches/next-gen/lib/PFTools/Bridge.pm Tue Sep 7 10:08:17 2010
@@ -22,7 +22,6 @@
use strict;
use warnings;
-use Data::Dumper;
use English qw( -no_match_vars ); # Avoids regex performance penalty
BEGIN {
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=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Compat/Parser.pm (original)
+++ branches/next-gen/lib/PFTools/Compat/Parser.pm Tue Sep 7 10:08:17 2010
@@ -25,6 +25,8 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+use PFTools::Logger;
+
our @ISA = ('Exporter');
our @EXPORT = qw(
@@ -33,8 +35,6 @@
);
our @EXPORT_OK = qw();
-
-use PFTools::Logger;
###################################################
########
Modified: branches/next-gen/lib/PFTools/Compat/Translation.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Compat/Translation.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Compat/Translation.pm (original)
+++ branches/next-gen/lib/PFTools/Compat/Translation.pm Tue Sep 7 10:08:17 2010
@@ -24,6 +24,9 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+use NetAddr::IP;
+
+use PFTools::Logger;
our @ISA = ('Exporter');
@@ -34,9 +37,6 @@
);
our @EXPORT_OK = qw();
-
-use PFTools::Logger;
-use NetAddr::IP;
sub Translate_old2new_config ($) {
my ($conf_parsed) = @_;
Modified: branches/next-gen/lib/PFTools/Conf.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Conf.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Conf.pm (original)
+++ branches/next-gen/lib/PFTools/Conf.pm Tue Sep 7 10:08:17 2010
@@ -27,17 +27,17 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+use Fcntl ':mode';
+use Storable;
+use Sys::Hostname;
+
+use PFTools::Conf::Host;
+use PFTools::Conf::Network;
+use PFTools::Conf::Syntax;
+use PFTools::Logger;
use PFTools::Net;
use PFTools::Parser;
-use PFTools::Logger;
use PFTools::Structqueries;
-use PFTools::Conf::Syntax;
-use PFTools::Conf::Host;
-use PFTools::Conf::Network;
-use Sys::Hostname;
-use Fcntl ':mode';
-use Data::Dumper;
-use Storable;
our @ISA = ('Exporter');
Modified: branches/next-gen/lib/PFTools/Conf/Host.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Conf/Host.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Conf/Host.pm (original)
+++ branches/next-gen/lib/PFTools/Conf/Host.pm Tue Sep 7 10:08:17 2010
@@ -24,6 +24,12 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+use Fcntl ':mode';
+use POSIX qw(ceil floor);
+
+use PFTools::Logger;
+use PFTools::Net;
+use PFTools::Structqueries;
our @ISA = ('Exporter');
@@ -33,14 +39,6 @@
);
our @EXPORT_OK = qw();
-
-use Fcntl ':mode';
-use POSIX qw(ceil floor);
-
-use PFTools::Logger;
-use PFTools::Structqueries;
-use PFTools::Net;
-use Data::Dumper;
#########################################################################
#
Modified: branches/next-gen/lib/PFTools/Conf/Network.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Conf/Network.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Conf/Network.pm (original)
+++ branches/next-gen/lib/PFTools/Conf/Network.pm Tue Sep 7 10:08:17 2010
@@ -27,6 +27,10 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+
+use PFTools::Logger;
+use PFTools::Net;
+use PFTools::Structqueries;
our @ISA = ('Exporter');
@@ -37,11 +41,6 @@
);
our @EXPORT_OK = qw();
-
-use PFTools::Logger;
-use PFTools::Structqueries;
-use PFTools::Net;
-use Data::Dumper;
#########################################################################
### Rewrite with new syntax
Modified: branches/next-gen/lib/PFTools/Conf/Syntax.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Conf/Syntax.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Conf/Syntax.pm (original)
+++ branches/next-gen/lib/PFTools/Conf/Syntax.pm Tue Sep 7 10:08:17 2010
@@ -24,6 +24,8 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+
+use PFTools::Logger;
our @ISA = ('Exporter');
@@ -38,8 +40,6 @@
);
our @EXPORT_OK = qw();
-
-use PFTools::Logger;
# Syntax definitions
our $ALLOWED_PARSING_CONTEXT = '(host|network|config|model)';
Modified: branches/next-gen/lib/PFTools/Disk.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Disk.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Disk.pm (original)
+++ branches/next-gen/lib/PFTools/Disk.pm Tue Sep 7 10:08:17 2010
@@ -25,6 +25,8 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+use PFTools::Logger;
+
our @ISA = ('Exporter');
our @EXPORT = qw(
@@ -33,8 +35,6 @@
);
our @EXPORT_OK = qw();
-
-use PFTools::Logger;
######################################
### Constants
Modified: branches/next-gen/lib/PFTools/Net.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Net.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Net.pm (original)
+++ branches/next-gen/lib/PFTools/Net.pm Tue Sep 7 10:08:17 2010
@@ -27,6 +27,11 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+use Net::DNS;
+use NetAddr::IP;
+
+use PFTools::Logger;
+use PFTools::Structqueries;
our @ISA = ('Exporter');
@@ -36,12 +41,6 @@
);
our @EXPORT_OK = qw();
-
-use PFTools::Logger;
-use PFTools::Structqueries;
-use NetAddr::IP;
-use Net::DNS;
-use Data::Dumper;
#########################################################################
### Rewrite with new syntax
Modified: branches/next-gen/lib/PFTools/Packages.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Packages.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Packages.pm (original)
+++ branches/next-gen/lib/PFTools/Packages.pm Tue Sep 7 10:08:17 2010
@@ -24,6 +24,8 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+
+use PFTools::Logger;
our @ISA = ('Exporter');
@@ -38,8 +40,6 @@
);
our @EXPORT_OK = qw();
-
-use PFTools::Logger;
my $PKG_CMD = {};
$PKG_CMD->{'deb'}->{'status'} = 'LANG=C LC_ALL=C /usr/bin/dpkg -s';
Modified: branches/next-gen/lib/PFTools/Parser.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Parser.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Parser.pm (original)
+++ branches/next-gen/lib/PFTools/Parser.pm Tue Sep 7 10:08:17 2010
@@ -22,8 +22,11 @@
use strict;
use warnings;
+use Config::IniFiles;
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+
+use PFTools::Logger;
our @ISA = ('Exporter');
@@ -32,9 +35,6 @@
);
our @EXPORT_OK = qw();
-
-use PFTools::Logger;
-use Config::IniFiles;
######################
### Constants
Modified: branches/next-gen/lib/PFTools/Structqueries.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Structqueries.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Structqueries.pm (original)
+++ branches/next-gen/lib/PFTools/Structqueries.pm Tue Sep 7 10:08:17 2010
@@ -29,7 +29,6 @@
use Exporter;
use PFTools::Logger;
-use Data::Dumper;
our @ISA = ('Exporter');
Modified: branches/next-gen/lib/PFTools/Update.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Update.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update.pm (original)
+++ branches/next-gen/lib/PFTools/Update.pm Tue Sep 7 10:08:17 2010
@@ -29,6 +29,19 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+use PFTools::Logger;
+use PFTools::Packages;
+use PFTools::Update::Addfile;
+use PFTools::Update::Addlink;
+use PFTools::Update::Addmount;
+use PFTools::Update::Common;
+use PFTools::Update::Createfile;
+use PFTools::Update::Installpkg;
+use PFTools::Update::Mkdir;
+use PFTools::Update::Purgepkg;
+use PFTools::Update::Removedir;
+use PFTools::Update::Removefile;
+
our @ISA = ('Exporter');
our @EXPORT = qw(
@@ -38,19 +51,6 @@
);
our @EXPORT_OK = qw();
-
-use PFTools::Update::Common;
-use PFTools::Update::Addfile;
-use PFTools::Update::Installpkg;
-use PFTools::Update::Purgepkg;
-use PFTools::Update::Mkdir;
-use PFTools::Update::Addmount;
-use PFTools::Update::Createfile;
-use PFTools::Update::Addlink;
-use PFTools::Update::Removefile;
-use PFTools::Update::Removedir;
-use PFTools::Logger;
-use PFTools::Packages;
###########################################
# Global vars
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=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update/Addfile.pm (original)
+++ branches/next-gen/lib/PFTools/Update/Addfile.pm Tue Sep 7 10:08:17 2010
@@ -24,6 +24,13 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+use File::Compare;
+use File::Copy;
+use Text::Diff;
+
+use PFTools::Conf;
+use PFTools::Logger;
+use PFTools::Update::Common;
our @ISA = ('Exporter');
@@ -33,13 +40,6 @@
);
our @EXPORT_OK = qw();
-
-use File::Compare;
-use File::Copy;
-use Text::Diff;
-use PFTools::Logger;
-use PFTools::Conf;
-use PFTools::Update::Common;
sub Addfile_depends ($$$) {
my ( $ref_section, $dest, $options ) = @_;
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=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update/Addlink.pm (original)
+++ branches/next-gen/lib/PFTools/Update/Addlink.pm Tue Sep 7 10:08:17 2010
@@ -25,6 +25,10 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+use PFTools::Conf;
+use PFTools::Logger;
+use PFTools::Update::Common;
+
our @ISA = ('Exporter');
our @EXPORT = qw(
@@ -33,10 +37,6 @@
);
our @EXPORT_OK = qw();
-
-use PFTools::Conf;
-use PFTools::Logger;
-use PFTools::Update::Common;
sub Addlink_depends ($$$) {
my ( $ref_section, $dest, $options ) = @_;
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=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update/Addmount.pm (original)
+++ branches/next-gen/lib/PFTools/Update/Addmount.pm Tue Sep 7 10:08:17 2010
@@ -24,6 +24,17 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+use File::Copy;
+use Text::Diff;
+
+use PFTools::Conf;
+use PFTools::Disk;
+use PFTools::Logger;
+use PFTools::Net;
+use PFTools::Parser;
+use PFTools::Structqueries;
+use PFTools::Update::Common;
+use PFTools::Update::Mkdir;
our @ISA = ('Exporter');
@@ -33,18 +44,6 @@
);
our @EXPORT_OK = qw();
-
-use File::Copy;
-use Text::Diff;
-use PFTools::Parser;
-use PFTools::Logger;
-use PFTools::Conf;
-use PFTools::Net;
-use PFTools::Disk;
-use PFTools::Structqueries;
-use PFTools::Update::Common;
-use PFTools::Update::Mkdir;
-use Data::Dumper;
###############################################
# Constants
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=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update/Common.pm (original)
+++ branches/next-gen/lib/PFTools/Update/Common.pm Tue Sep 7 10:08:17 2010
@@ -24,6 +24,10 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+use File::Copy;
+
+use PFTools::Conf;
+use PFTools::Logger;
our @ISA = ('Exporter');
@@ -44,10 +48,6 @@
our @EXPORT_OK = qw();
-use PFTools::Logger;
-use PFTools::Conf;
-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=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update/Createfile.pm (original)
+++ branches/next-gen/lib/PFTools/Update/Createfile.pm Tue Sep 7 10:08:17 2010
@@ -24,6 +24,11 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+use File::Copy;
+
+use PFTools::Conf;
+use PFTools::Logger;
+use PFTools::Update::Common;
our @ISA = ('Exporter');
@@ -33,11 +38,6 @@
);
our @EXPORT_OK = qw();
-
-use File::Copy;
-use PFTools::Logger;
-use PFTools::Conf;
-use PFTools::Update::Common;
sub Createfile_depends ($$$) {
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=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update/Installpkg.pm (original)
+++ branches/next-gen/lib/PFTools/Update/Installpkg.pm Tue Sep 7 10:08:17 2010
@@ -22,8 +22,16 @@
use strict;
use warnings;
+use Debconf::ConfModule;
+use Debconf::Db;
+use Debconf::Template;
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+
+use PFTools::Conf;
+use PFTools::Logger;
+use PFTools::Packages;
+use PFTools::Update::Common;
our @ISA = ('Exporter');
@@ -33,16 +41,6 @@
);
our @EXPORT_OK = qw();
-
-use PFTools::Logger;
-use PFTools::Conf;
-use PFTools::Packages;
-use PFTools::Update::Common;
-
-#Librairies Debconf
-use Debconf::Db;
-use Debconf::Template;
-use Debconf::ConfModule;
###########################################
### Environement vars
Modified: branches/next-gen/lib/PFTools/Update/Mkdir.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Update/Mkdir.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update/Mkdir.pm (original)
+++ branches/next-gen/lib/PFTools/Update/Mkdir.pm Tue Sep 7 10:08:17 2010
@@ -24,6 +24,13 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+use File::Compare;
+use File::Copy;
+use Text::Diff;
+
+use PFTools::Conf;
+use PFTools::Logger;
+use PFTools::Update::Common;
our @ISA = ('Exporter');
@@ -33,13 +40,6 @@
);
our @EXPORT_OK = qw();
-
-use File::Compare;
-use File::Copy;
-use Text::Diff;
-use PFTools::Logger;
-use PFTools::Conf;
-use PFTools::Update::Common;
sub Mkdir_depends ($$$) {
my ( $ref_section, $dest, $options ) = @_;
Modified: branches/next-gen/lib/PFTools/Update/Purgepkg.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Update/Purgepkg.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update/Purgepkg.pm (original)
+++ branches/next-gen/lib/PFTools/Update/Purgepkg.pm Tue Sep 7 10:08:17 2010
@@ -25,6 +25,11 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+use PFTools::Conf;
+use PFTools::Logger;
+use PFTools::Packages;
+use PFTools::Update::Common;
+
our @ISA = ('Exporter');
our @EXPORT = qw(
@@ -32,11 +37,6 @@
);
our @EXPORT_OK = qw();
-
-use PFTools::Logger;
-use PFTools::Conf;
-use PFTools::Packages;
-use PFTools::Update::Common;
sub Purgepkg_action ($$$$$) {
my ( $ref_section, $dest, $options, $hash_subst, $global_config ) = @_;
Modified: branches/next-gen/lib/PFTools/Update/Removedir.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Update/Removedir.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update/Removedir.pm (original)
+++ branches/next-gen/lib/PFTools/Update/Removedir.pm Tue Sep 7 10:08:17 2010
@@ -25,6 +25,10 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+use PFTools::Conf;
+use PFTools::Logger;
+use PFTools::Update::Common;
+
our @ISA = ('Exporter');
our @EXPORT = qw(
@@ -32,10 +36,6 @@
);
our @EXPORT_OK = qw();
-
-use PFTools::Logger;
-use PFTools::Conf;
-use PFTools::Update::Common;
sub Removedir_action ($$$$$) {
my ( $ref_section, $dest, $options, $hash_subst, $global_config ) = @_;
Modified: branches/next-gen/lib/PFTools/Update/Removefile.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Update/Removefile.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Update/Removefile.pm (original)
+++ branches/next-gen/lib/PFTools/Update/Removefile.pm Tue Sep 7 10:08:17 2010
@@ -25,6 +25,10 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+use PFTools::Conf;
+use PFTools::Logger;
+use PFTools::Update::Common;
+
our @ISA = ('Exporter');
our @EXPORT = qw(
@@ -32,10 +36,6 @@
);
our @EXPORT_OK = qw();
-
-use PFTools::Logger;
-use PFTools::Conf;
-use PFTools::Update::Common;
sub Removefile_action ($$$$$) {
my ( $ref_section, $dest, $options, $hash_subst, $global_config ) = @_;
Modified: branches/next-gen/lib/PFTools/Utils.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Utils.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Utils.pm (original)
+++ branches/next-gen/lib/PFTools/Utils.pm Tue Sep 7 10:08:17 2010
@@ -22,8 +22,19 @@
use strict;
use warnings;
+use Digest::MD5;
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+use File::Compare;
+use File::Copy;
+use Template::Tiny;
+
+use PFTools::Conf;
+use PFTools::Logger;
+use PFTools::Net;
+use PFTools::Structqueries;
+use PFTools::Update;
+use PFTools::VCS;
our @ISA = ('Exporter');
@@ -44,18 +55,6 @@
Resolv_hostname_from_GLOBAL
Search_and_replace
);
-
-use PFTools::Logger;
-use PFTools::Structqueries;
-use PFTools::Net;
-use PFTools::Conf;
-use PFTools::Update;
-use PFTools::VCS;
-use Data::Dumper;
-use Template::Tiny;
-use File::Compare;
-use File::Copy;
-use Digest::MD5;
our @EXPORT_OK = qw();
Modified: branches/next-gen/lib/PFTools/VCS.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/VCS.pm?rev=884&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/VCS.pm (original)
+++ branches/next-gen/lib/PFTools/VCS.pm Tue Sep 7 10:08:17 2010
@@ -27,8 +27,8 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
+
use PFTools::Logger;
-use Data::Dumper;
our @ISA = ('Exporter');
Modified: branches/next-gen/sbin/fix_hosts
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/sbin/fix_hosts?rev=884&op=diff
==============================================================================
--- branches/next-gen/sbin/fix_hosts (original)
+++ branches/next-gen/sbin/fix_hosts Tue Sep 7 10:08:17 2010
@@ -24,13 +24,14 @@
use strict;
use warnings;
+use Data::Dumper;
+use English qw( -no_match_vars ); # Avoids regex performance penalty
use Getopt::Long qw( :config ignore_case_always bundling );
-use English qw( -no_match_vars ); # Avoids regex performance penalty
+use Sys::Hostname;
+
+use PFTools::Logger;
use PFTools::Structqueries;
use PFTools::Utils;
-use PFTools::Logger;
-use Sys::Hostname;
-use Data::Dumper;
#################################
# VARS
Modified: branches/next-gen/sbin/mk_dhcp
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/sbin/mk_dhcp?rev=884&op=diff
==============================================================================
--- branches/next-gen/sbin/mk_dhcp (original)
+++ branches/next-gen/sbin/mk_dhcp Tue Sep 7 10:08:17 2010
@@ -26,6 +26,7 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Getopt::Long qw( :config ignore_case_always bundling );
+
use PFTools::Logger;
use PFTools::Utils;
Modified: branches/next-gen/sbin/mk_grubopt
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/sbin/mk_grubopt?rev=884&op=diff
==============================================================================
--- branches/next-gen/sbin/mk_grubopt (original)
+++ branches/next-gen/sbin/mk_grubopt Tue Sep 7 10:08:17 2010
@@ -24,12 +24,13 @@
use strict;
use warnings;
+use English qw( -no_match_vars ); # Avoids regex performance penalty
+use Getopt::Long qw( :config ignore_case_always bundling );
use Sys::Hostname;
+
use PFTools::Logger;
+use PFTools::Structqueries;
use PFTools::Utils;
-use PFTools::Structqueries;
-use Getopt::Long qw( :config ignore_case_always bundling );
-use English qw( -no_match_vars ); # Avoids regex performance penalty
####################################################
# Vars
Modified: branches/next-gen/sbin/mk_interfaces
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/sbin/mk_interfaces?rev=884&op=diff
==============================================================================
--- branches/next-gen/sbin/mk_interfaces (original)
+++ branches/next-gen/sbin/mk_interfaces Tue Sep 7 10:08:17 2010
@@ -23,12 +23,13 @@
use strict;
use warnings;
+use English qw( -no_match_vars ); # Avoids regex performance penalty
use Getopt::Long qw( :config ignore_case_always bundling );
-use English qw( -no_match_vars ); # Avoids regex performance penalty
+use Sys::Hostname;
+
+use PFTools::Logger;
+use PFTools::Structqueries;
use PFTools::Utils;
-use PFTools::Structqueries;
-use PFTools::Logger;
-use Sys::Hostname;
#################################
# VARS
Modified: branches/next-gen/sbin/mk_pxelinuxcfg
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/sbin/mk_pxelinuxcfg?rev=884&op=diff
==============================================================================
--- branches/next-gen/sbin/mk_pxelinuxcfg (original)
+++ branches/next-gen/sbin/mk_pxelinuxcfg Tue Sep 7 10:08:17 2010
@@ -24,11 +24,12 @@
use strict;
use warnings;
+use Data::Dumper;
+use English qw( -no_match_vars ); # Avoids regex performance penalty
use Getopt::Long qw( :config ignore_case_always bundling );
-use English qw( -no_match_vars ); # Avoids regex performance penalty
+
+use PFTools::Logger;
use PFTools::Utils;
-use PFTools::Logger;
-use Data::Dumper;
############################################
# Vars
Modified: branches/next-gen/sbin/mk_resolvconf
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/sbin/mk_resolvconf?rev=884&op=diff
==============================================================================
--- branches/next-gen/sbin/mk_resolvconf (original)
+++ branches/next-gen/sbin/mk_resolvconf Tue Sep 7 10:08:17 2010
@@ -23,12 +23,13 @@
use strict;
use warnings;
+use English qw( -no_match_vars ); # Avoids regex performance penalty
use Getopt::Long qw( :config ignore_case_always bundling );
-use English qw( -no_match_vars ); # Avoids regex performance penalty
-use PFTools::Utils;
+use Sys::Hostname;
+
use PFTools::Logger;
use PFTools::Structqueries;
-use Sys::Hostname;
+use PFTools::Utils;
#################################
# VARS
Modified: branches/next-gen/sbin/mk_sitezone
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/sbin/mk_sitezone?rev=884&op=diff
==============================================================================
--- branches/next-gen/sbin/mk_sitezone (original)
+++ branches/next-gen/sbin/mk_sitezone Tue Sep 7 10:08:17 2010
@@ -22,13 +22,11 @@
use strict;
use warnings;
-use strict;
-use warnings;
-
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Getopt::Long qw( :config ignore_case_always bundling );
+
+use PFTools::Logger;
use PFTools::Utils;
-use PFTools::Logger;
#################################
# VARS
Modified: branches/next-gen/sbin/mk_sourceslist
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/sbin/mk_sourceslist?rev=884&op=diff
==============================================================================
--- branches/next-gen/sbin/mk_sourceslist (original)
+++ branches/next-gen/sbin/mk_sourceslist Tue Sep 7 10:08:17 2010
@@ -24,12 +24,13 @@
use strict;
use warnings;
-use PFTools::Utils;
+use English qw( -no_match_vars ); # Avoids regex performance penalty
+use Getopt::Long qw( :config ignore_case_always bundling );
+use Sys::Hostname;
+
use PFTools::Logger;
use PFTools::Structqueries;
-use Sys::Hostname;
-use English qw( -no_match_vars ); # Avoids regex performance penalty
-use Getopt::Long qw( :config ignore_case_always bundling );
+use PFTools::Utils;
############################################
# Vars
Modified: branches/next-gen/sbin/update-config
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/sbin/update-config?rev=884&op=diff
==============================================================================
--- branches/next-gen/sbin/update-config (original)
+++ branches/next-gen/sbin/update-config Tue Sep 7 10:08:17 2010
@@ -26,13 +26,12 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Getopt::Long qw( :config ignore_case_always bundling );
+use Sys::Hostname;
-use PFTools::Utils;
use PFTools::Conf;
use PFTools::Logger;
use PFTools::Structqueries;
-use Sys::Hostname;
-use Data::Dumper;
+use PFTools::Utils;
#################################
# VARS
Modified: branches/next-gen/tools/Display_IP_config
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/tools/Display_IP_config?rev=884&op=diff
==============================================================================
--- branches/next-gen/tools/Display_IP_config (original)
+++ branches/next-gen/tools/Display_IP_config Tue Sep 7 10:08:17 2010
@@ -27,11 +27,11 @@
use strict;
use warnings;
-use Data::Dumper;
use English qw( -no_match_vars ); # Avoids regex performance penalty
+use Getopt::Long qw ( :config ignore_case_always bundling );
+use NetAddr::IP;
+
use PFTools::Utils;
-use NetAddr::IP;
-use Getopt::Long qw ( :config ignore_case_always bundling );
####################################################
# Vars
Modified: branches/next-gen/tools/Translate_old_config
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/tools/Translate_old_config?rev=884&op=diff
==============================================================================
--- branches/next-gen/tools/Translate_old_config (original)
+++ branches/next-gen/tools/Translate_old_config Tue Sep 7 10:08:17 2010
@@ -29,10 +29,11 @@
use Data::Dumper;
use English qw( -no_match_vars ); # Avoids regex performance penalty
-use PFTools::Logger;
+use Getopt::Long qw ( :config ignore_case_always bundling );
+
use PFTools::Compat::Parser;
use PFTools::Compat::Translation;
-use Getopt::Long qw ( :config ignore_case_always bundling );
+use PFTools::Logger;
#################################
# Global vars
Modified: branches/next-gen/tools/dumpiplist.pl
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/tools/dumpiplist.pl?rev=884&op=diff
==============================================================================
--- branches/next-gen/tools/dumpiplist.pl (original)
+++ branches/next-gen/tools/dumpiplist.pl Tue Sep 7 10:08:17 2010
@@ -27,11 +27,11 @@
use strict;
use warnings;
-use Data::Dumper;
use English qw( -no_match_vars ); # Avoids regex performance penalty
+use Getopt::Long qw ( :config ignore_case_always bundling );
+
use PFTools::Net;
use PFTools::Update;
-use Getopt::Long qw ( :config ignore_case_always bundling );
my $help = 0;
my $type = '';
@@ -182,7 +182,6 @@
die "Non existant server type " . $type . "\n";
}
-# print Dumper $PF_NET;
if ($type) {
if ($read) {
foreach my $srv ( sort keys %{ $SRV_LIST->{$type}->{'SRVLIST'} } ) {
Modified: branches/next-gen/tools/pflaunch
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/tools/pflaunch?rev=884&op=diff
==============================================================================
--- branches/next-gen/tools/pflaunch (original)
+++ branches/next-gen/tools/pflaunch Tue Sep 7 10:08:17 2010
@@ -40,10 +40,9 @@
use Sys::Hostname;
use Thread;
-use Sitalibs::Config;
-
use PFTools::Net;
use PFTools::Update;
+use Sitalibs::Config;
my $HOSTNAME = hostname;
Modified: branches/next-gen/tools/umlaunch
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/tools/umlaunch?rev=884&op=diff
==============================================================================
--- branches/next-gen/tools/umlaunch (original)
+++ branches/next-gen/tools/umlaunch Tue Sep 7 10:08:17 2010
@@ -29,6 +29,7 @@
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Getopt::Long;
use Socket;
+
use PFTools::Conf;
use PFTools::Net;
use PFTools::Update;
Modified: branches/next-gen/tools/xenlaunch
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/tools/xenlaunch?rev=884&op=diff
==============================================================================
--- branches/next-gen/tools/xenlaunch (original)
+++ branches/next-gen/tools/xenlaunch Tue Sep 7 10:08:17 2010
@@ -21,10 +21,11 @@
use strict;
use warnings;
-use Sitalibs::Config;
use Data::Dumper;
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Getopt::Long;
+
+use Sitalibs::Config;
my $XENCFGDIR = "/etc/xen";
my $KERNELDIR = "/distrib/tftpboot";
More information about the pf-tools-commits
mailing list