pf-tools/pf-tools: 3 new changesets

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

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/b7a896b829db
changeset: 1309:b7a896b829db
user:      shad
date:      Tue Aug 12 17:35:44 2014 +0200
description:
accept tmpfs

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/b3c4a41c1842
changeset: 1310:b3c4a41c1842
user:      shad
date:      Tue Aug 12 17:36:07 2014 +0200
description:
error message more visible and clear

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/9632cbd63877
changeset: 1311:9632cbd63877
user:      shad
date:      Wed Aug 13 11:49:34 2014 +0200
description:
doc

diffstat:

 filters/filter_privateresolve    |   4 ++++
 lib/PFTools/Conf/Syntax.pm       |   2 +-
 lib/PFTools/Update/ADDFILE.pm    |   2 +-
 lib/PFTools/Update/ADDMOUNT.pm   |   5 +++--
 lib/PFTools/Update/INSTALLPKG.pm |  10 +++++++---
 lib/PFTools/Utils.pm             |   1 +
 tools/Translate_old_config       |   2 +-
 7 files changed, 18 insertions(+), 8 deletions(-)

diffs (106 lines):

diff -r f02ac51ae9ba -r 9632cbd63877 filters/filter_privateresolve
--- a/filters/filter_privateresolve	Mon Aug 11 18:04:00 2014 +0200
+++ b/filters/filter_privateresolve	Wed Aug 13 11:49:34 2014 +0200
@@ -119,6 +119,10 @@
  -t --type                 : type for resolution. Allowed values are cnf
                              (from global configuration structure) and dns
  --sep                     : separator between resolved IPs [default: space]
+                             if the separator is the string "DUPLICATE",
+                             and a name in the template resolve to several IP,
+                             the filtered line is copied with only one IP
+                             per line
  -i --input                : input file [default: STDIN]
  -o --output               : output file [default: STDOUT]
     
diff -r f02ac51ae9ba -r 9632cbd63877 lib/PFTools/Conf/Syntax.pm
--- a/lib/PFTools/Conf/Syntax.pm	Mon Aug 11 18:04:00 2014 +0200
+++ b/lib/PFTools/Conf/Syntax.pm	Wed Aug 13 11:49:34 2014 +0200
@@ -302,7 +302,7 @@
             'MANDATORY_KEYS' => [ 'source', 'fstype', 'options' ],
             'depends'        => 'undefined',
             'source'         => 'undefined',
-            'fstype'  => '(nfs|ext[2-4]|btrfs|cifs)',
+            'fstype'  => '(nfs|ext[2-4]|btrfs|cifs|tmpfs)',
             'options' => 'undefined',
             'mode'    => '[0-7]?[0-7]{3}',
         },
diff -r f02ac51ae9ba -r 9632cbd63877 lib/PFTools/Update/ADDFILE.pm
--- a/lib/PFTools/Update/ADDFILE.pm	Mon Aug 11 18:04:00 2014 +0200
+++ b/lib/PFTools/Update/ADDFILE.pm	Wed Aug 13 11:49:34 2014 +0200
@@ -113,7 +113,7 @@
     }
 
     if ( !-f $tmp ) {
-        carp qq{ERROR: Unable to open $tmp};
+        carp colored( qq{ERROR: Unable to open filtered $tmp}, q{bold red on_white} );
         return;
     }
 
diff -r f02ac51ae9ba -r 9632cbd63877 lib/PFTools/Update/ADDMOUNT.pm
--- a/lib/PFTools/Update/ADDMOUNT.pm	Mon Aug 11 18:04:00 2014 +0200
+++ b/lib/PFTools/Update/ADDMOUNT.pm	Wed Aug 13 11:49:34 2014 +0200
@@ -336,8 +336,9 @@
                         . $add_mount->{'options'} . q{' '}
                         . $dest . q{'};
                     if ( deferredlogsystem($cmd) ) {
-                        carp
-                            qq{ERROR: while remounting $dest with\n$add_mount->{'options'}};
+                        carp colored(
+                            qq{ERROR: while remounting $dest with\n$add_mount->{'options'}},
+                            q{bold red on_white} );
                         return;
                     }
                 }
diff -r f02ac51ae9ba -r 9632cbd63877 lib/PFTools/Update/INSTALLPKG.pm
--- a/lib/PFTools/Update/INSTALLPKG.pm	Mon Aug 11 18:04:00 2014 +0200
+++ b/lib/PFTools/Update/INSTALLPKG.pm	Wed Aug 13 11:49:34 2014 +0200
@@ -101,11 +101,14 @@
         = get_pkg_policy( $options->{'pkg_type'},
         $dest, $ref_section->{'version'} );
     if ( !$available_version ) {
-        carp qq{ERROR: Package $dest is unavailable};
+        carp colored( qq{ERROR: Package $dest is unavailable},
+            q{bold red on_white} );
         return;
     }
     if ( defined( $ref_section->{'version'} ) && !$specified_version ) {
-        carp qq{ERROR: $dest ($ref_section->{'version'}) is unavailable};
+        carp colored(
+            qq{ERROR: $dest ($ref_section->{'version'}) is unavailable},
+            q{bold red on_white} );
         return;
     }
     if ( !defined $installed_version ) {
@@ -190,7 +193,8 @@
                 )
                 )
             {
-                carp qq{ERROR: Unable to install $dest};
+                carp colored( qq{ERROR: Unable to install $dest},
+                    q{bold red on_white} );
                 return;
             }
         }
diff -r f02ac51ae9ba -r 9632cbd63877 lib/PFTools/Utils.pm
--- a/lib/PFTools/Utils.pm	Mon Aug 11 18:04:00 2014 +0200
+++ b/lib/PFTools/Utils.pm	Wed Aug 13 11:49:34 2014 +0200
@@ -851,6 +851,7 @@
                 if (@depends) {
                     if ( !$options->{'quiet'} ) {
                         print colored( qq{<$section> }, q{cyan} )
+                            . q{ depends on }
                             . join( q{ }, @depends ) . qq{\n};
                     }
                     $errorcount += __do_updateloop( $host_config, $options,
diff -r f02ac51ae9ba -r 9632cbd63877 tools/Translate_old_config
--- a/tools/Translate_old_config	Mon Aug 11 18:04:00 2014 +0200
+++ b/tools/Translate_old_config	Wed Aug 13 11:49:34 2014 +0200
@@ -122,7 +122,7 @@
     }
     elsif ( $_ =~ m{\A \@include \s* (.*) \z}msx ) {
         if ( $options->{'type'} eq 'config' ) {
-            $current_section = qq{include-$1};
+            $current_section = qq{COMMON:/include-$1};
             push @included_list, $current_section;
         }
         else {