pf-tools/pf-tools: 2 new changesets
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Tue Apr 15 15:45:35 UTC 2014
details: http://hg.debian.org/hg/pf-tools/pf-tools/rev/8512349141f4
changeset: 1274:8512349141f4
user: shad
date: Tue Apr 15 11:32:30 2014 +0200
description:
more homogen
details: http://hg.debian.org/hg/pf-tools/pf-tools/rev/83fda81d97e4
changeset: 1275:83fda81d97e4
user: shad
date: Tue Apr 15 17:03:30 2014 +0200
description:
template_filename was overwritten by the one in args_ref
diffstat:
lib/PFTools/Conf/Host.pm | 2 +-
lib/PFTools/Conf/Network.pm | 11 ++++++-----
lib/PFTools/Packages/DEB.pm | 26 ++++++++++----------------
lib/PFTools/Update/INSTALLPKG.pm | 6 ++++--
lib/PFTools/Utils.pm | 12 ++++++------
lib/PFTools/VCS/CVS.pm | 3 ++-
lib/PFTools/VCS/HG.pm | 3 ++-
lib/PFTools/VCS/SVN.pm | 3 ++-
8 files changed, 33 insertions(+), 33 deletions(-)
diffs (228 lines):
diff -r e2df0c249143 -r 83fda81d97e4 lib/PFTools/Conf/Host.pm
--- a/lib/PFTools/Conf/Host.pm Tue Apr 15 11:17:23 2014 +0200
+++ b/lib/PFTools/Conf/Host.pm Tue Apr 15 17:03:30 2014 +0200
@@ -169,7 +169,7 @@
||= $host_ref->{"link::$link"}->{'dev'};
if ( !$iface ) {
carp
- qq{WARNING no 'dev' section for '$hostname', maybe not enough interface on the server};
+ qq{WARNING: no 'dev' section for '$hostname', maybe not enough interface on the server};
next;
}
elsif ( $iface eq q{NONE} ) {
diff -r e2df0c249143 -r 83fda81d97e4 lib/PFTools/Conf/Network.pm
--- a/lib/PFTools/Conf/Network.pm Tue Apr 15 11:17:23 2014 +0200
+++ b/lib/PFTools/Conf/Network.pm Tue Apr 15 17:03:30 2014 +0200
@@ -91,7 +91,8 @@
my $zone_key = $ip_type eq 'ipv6' ? 'ZONE6' : 'ZONE';
my $zone_part = $global_config->{$zone_key}->{'BY_NAME'};
if ( defined $zone_part->{$section_name} ) {
- carp qq{WARN: $section_name from $start_file is already defined};
+ carp
+ qq{WARNING: $section_name from $start_file is already defined};
return;
}
@@ -136,14 +137,14 @@
{qw( start_file section_name section_ref global_config pf_config )};
if ( defined $global_config->{'SITE'}->{'BY_NAME'}->{$section_name} ) {
- carp qq{WARN: $section_name from $start_file already defined};
+ carp qq{WARNING: $section_name from $start_file already defined};
return;
}
if ( $section_ref->{'state'} eq 'ROOT' ) {
if ( $global_config->{'SITE'}->{'ROOT'} ) {
carp
- qq{WARN: ROOT site is already defined: skipping $section_name};
+ qq{WARNING: ROOT site is already defined: skipping $section_name};
return;
}
@@ -286,7 +287,7 @@
# FIXME is this not a fatal error?
carp
- qq{WARN: file $start_file section $section_name: already defined};
+ qq{WARNING: file $start_file section $section_name: already defined};
next;
}
@@ -399,7 +400,7 @@
$zone_part->{'ALL_SITES'}->{$net_name} = $zone_ref;
push @{ $zone_part->{'ALL_SITES'}->{'__network_order'} }, $net_name;
@{ $zone_part->{'ALL_SITES'}->{'__network_order'} }
- = uniq(@{ $zone_part->{'ALL_SITES'}->{'__network_order'} });
+ = uniq( @{ $zone_part->{'ALL_SITES'}->{'__network_order'} } );
}
return 1;
diff -r e2df0c249143 -r 83fda81d97e4 lib/PFTools/Packages/DEB.pm
--- a/lib/PFTools/Packages/DEB.pm Tue Apr 15 11:17:23 2014 +0200
+++ b/lib/PFTools/Packages/DEB.pm Tue Apr 15 17:03:30 2014 +0200
@@ -63,16 +63,13 @@
if ( deferredlogsystem("$PKG_CMD->{'status'} '$pkg_name'") ) {
$result->{'installed'} = 0;
- carp qq{WARN: $pkg_name is not installed: $OS_ERROR"}
+ carp qq{WARNING: $pkg_name is not installed: $OS_ERROR"}
if ($VERBOSE);
return $result;
}
- unless (
- $output_fh = IO::File->new(
- "$PKG_CMD->{'status'} '$pkg_name' 2>/dev/null |"
- )
- )
+ unless ( $output_fh
+ = IO::File->new("$PKG_CMD->{'status'} '$pkg_name' 2>/dev/null |") )
{
carp qq{ERROR: while getting status for $pkg_name : $OS_ERROR}
if ($VERBOSE);
@@ -129,11 +126,8 @@
my $dep_list = q{};
my $output_fh;
- unless (
- $output_fh = IO::File->new(
- "$PKG_CMD->{'depends'} '$pkg_name' 2>/dev/null |"
- )
- )
+ unless ( $output_fh
+ = IO::File->new("$PKG_CMD->{'depends'} '$pkg_name' 2>/dev/null |") )
{
carp qq{ERROR: while getting deps for $pkg_name : $OS_ERROR"}
if ($VERBOSE);
@@ -176,9 +170,8 @@
my ( $installed, $available, $specified_version, $output_fh );
$specified_version = 0;
- $output_fh = IO::File->new(
- "$PKG_CMD->{'policy'} '$pkg_name' 2>/dev/null |"
- );
+ $output_fh
+ = IO::File->new("$PKG_CMD->{'policy'} '$pkg_name' 2>/dev/null |");
unless ($output_fh) {
carp qq{ERROR: while getting policy for $pkg_name : $OS_ERROR}
if ($VERBOSE);
@@ -237,11 +230,12 @@
return unless $pkg_name;
my $install_cmd = $PKG_CMD->{'install'};
- $install_cmd .= ( defined $version )
+ $install_cmd .=
+ ( defined $version )
? " '$pkg_name=$version'"
: " '$pkg_name'";
if ( deferredlogsystem($install_cmd) ) {
- carp qq{ERROR while installing $pkg_name : $OS_ERROR"}
+ carp qq{ERROR: while installing $pkg_name : $OS_ERROR"}
if ($VERBOSE);
return;
}
diff -r e2df0c249143 -r 83fda81d97e4 lib/PFTools/Update/INSTALLPKG.pm
--- a/lib/PFTools/Update/INSTALLPKG.pm Tue Apr 15 11:17:23 2014 +0200
+++ b/lib/PFTools/Update/INSTALLPKG.pm Tue Apr 15 17:03:30 2014 +0200
@@ -54,7 +54,9 @@
my $deps = Get_pkg_depends( $options->{'pkg_type'}, $dest );
if ( !$deps ) {
if ( $options->{'verbose'} ) {
- carp colored( qq{WARN: Unable to get or no dependency for $dest}, q{bold yellow on_white} );
+ carp colored(
+ qq{WARNING: Unable to get or no dependency for $dest},
+ q{bold yellow on_white} );
}
return;
}
@@ -112,7 +114,7 @@
}
if ($install) {
if ( $options->{'verbose'} || $options->{'simul'} ) {
- Log(colored(q{(action needed)}, q{bold red}));
+ Log( colored( q{(action needed)}, q{bold red} ) );
}
if ( $options->{'diff'} ) {
Log(q{(inst = }
diff -r e2df0c249143 -r 83fda81d97e4 lib/PFTools/Utils.pm
--- a/lib/PFTools/Utils.pm Tue Apr 15 11:17:23 2014 +0200
+++ b/lib/PFTools/Utils.pm Tue Apr 15 17:03:30 2014 +0200
@@ -199,16 +199,16 @@
$template_filename ||= join q{/}, $templates_dirname,
( $host_ref->{'deployment'}->{'preseed'}
|| $pf_config->{$mode}->{'preseed'} );
+ $args_ref->{template_filename} = $template_filename;
my $basename = qq{preseed_$hostname};
my $filename = join q{/}, $pf_config->{'path'}->{'preseed_dir'},
$basename;
__make_file(
- { file_type => q{preseed},
- filename => $filename,
- template_filename => $template_filename,
- host_ref => $host_ref,
+ { file_type => q{preseed},
+ filename => $filename,
+ host_ref => $host_ref,
%{$args_ref},
}
);
@@ -821,7 +821,7 @@
next if $depend eq q{.};
if ( $depend and $host_config->{$depend} ) {
if ( $depend eq $section ) {
- carp qq{WARN: [$section] circular dependancy};
+ carp qq{WARNING: [$section] circular dependancy};
next;
}
@@ -829,7 +829,7 @@
'addmount' )
{
carp colored(
- qq{WARN: [$section] depends on addmount [$depend], it may not work during install!},
+ qq{WARNING: [$section] depends on addmount [$depend], it may not work during install!},
q{bold yellow on_white}
);
}
diff -r e2df0c249143 -r 83fda81d97e4 lib/PFTools/VCS/CVS.pm
--- a/lib/PFTools/VCS/CVS.pm Tue Apr 15 11:17:23 2014 +0200
+++ b/lib/PFTools/VCS/CVS.pm Tue Apr 15 17:03:30 2014 +0200
@@ -53,7 +53,8 @@
if ( defined $options->{'branch'} && $options->{'branch'} ne q{} ) {
if ( $cvs_cmd ne q{} ) {
- carp qq{WARN: Ignoring $cvs_cmd with branch $options->{'branch'}};
+ carp
+ qq{WARNING: Ignoring $cvs_cmd with branch $options->{'branch'}};
}
}
elsif ( $pf_config->{'vcs'}->{'branch'} ) {
diff -r e2df0c249143 -r 83fda81d97e4 lib/PFTools/VCS/HG.pm
--- a/lib/PFTools/VCS/HG.pm Tue Apr 15 11:17:23 2014 +0200
+++ b/lib/PFTools/VCS/HG.pm Tue Apr 15 17:03:30 2014 +0200
@@ -59,7 +59,8 @@
if ( defined $options->{'branch'} && $options->{'branch'} ne q{} ) {
if ( $hg_cmd ne q{} ) {
- carp qq{WARN: Ignoring $hg_cmd with branch $options->{'branch'}};
+ carp
+ qq{WARNING: Ignoring $hg_cmd with branch $options->{'branch'}};
}
}
elsif ( $pf_config->{'vcs'}->{'branch'} ) {
diff -r e2df0c249143 -r 83fda81d97e4 lib/PFTools/VCS/SVN.pm
--- a/lib/PFTools/VCS/SVN.pm Tue Apr 15 11:17:23 2014 +0200
+++ b/lib/PFTools/VCS/SVN.pm Tue Apr 15 17:03:30 2014 +0200
@@ -58,7 +58,8 @@
if ( defined $options->{'branch'} && $options->{'branch'} ne q{} ) {
if ( $svn_cmd ne q{} ) {
- carp qq{WARN: Ignoring $svn_cmd with branch $options->{'branch'}};
+ carp
+ qq{WARNING: Ignoring $svn_cmd with branch $options->{'branch'}};
}
}
elsif ( $pf_config->{'vcs'}->{'branch'} ) {
More information about the pf-tools-commits
mailing list