pf-tools/pf-tools-0.33-stable: 2 new changesets
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Thu Nov 4 15:13:29 UTC 2010
details: http://hg.debian.org/hg/pf-tools/pf-tools-0.33-stable/rev/82b295cfe217
changeset: 543:82b295cfe217
user: Thomas Parmelan <tom at sitadelle.com>
date: Thu Nov 04 16:11:02 2010 +0100
description:
Less warnings
details: http://hg.debian.org/hg/pf-tools/pf-tools-0.33-stable/rev/bd9b429c6d05
changeset: 544:bd9b429c6d05
user: Thomas Parmelan <tom at sitadelle.com>
date: Thu Nov 04 16:11:16 2010 +0100
description:
Added tag 0.33.22-1 for changeset 82b295cfe217
diffstat:
7 files changed, 6 insertions(+), 9 deletions(-)
debian/changelog | 6 ++++++
filters/filter_distrib | 2 --
sbin/fix_hosts | 1 -
sbin/mk_grub2opt | 1 -
sbin/mk_grubopt | 1 -
sbin/mk_sourceslist | 2 --
sbin/update-config | 2 --
diffs (179 lines):
diff -r a6cc7e1dbbd4 -r bd9b429c6d05 .hgtags
--- a/.hgtags Thu Nov 04 14:53:42 2010 +0100
+++ b/.hgtags Thu Nov 04 16:11:16 2010 +0100
@@ -1,1 +1,2 @@
c8b620892c7dd95374cd81b205e1c323cbada277 0.33.21-1
+82b295cfe2174230e2cb1cf3965970917ed92d75 0.33.22-1
diff -r a6cc7e1dbbd4 -r bd9b429c6d05 debian/changelog
--- a/debian/changelog Thu Nov 04 14:53:42 2010 +0100
+++ b/debian/changelog Thu Nov 04 16:11:16 2010 +0100
@@ -1,3 +1,12 @@
+pf-tools (0.33.22-1) unstable; urgency=low
+
+ * filters/*, sbin/*, tools/*
+ - remove $version info, there's no $Revision$ anymore since we move to Hg
+ * lib/PFTools/Net.pm
+ - comment out two other warnings
+
+ -- Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org> Thu, 04 Nov 2010 16:09:55 +0100
+
pf-tools (0.33.21-1) unstable; urgency=low
[ Thomas Parmelan ]
diff -r a6cc7e1dbbd4 -r bd9b429c6d05 filters/filter_distrib
--- a/filters/filter_distrib Thu Nov 04 14:53:42 2010 +0100
+++ b/filters/filter_distrib Thu Nov 04 16:11:16 2010 +0100
@@ -29,13 +29,11 @@
my $program = $0;
$program =~ s%.*/%%; # cheap basename
-my $version = sprintf("svn-r%s", q$Revision$ =~ /([\d.]+)/);
-
sub Usage () {
print <<EOF
-$program - version $version
+$program
Synopsis : $program <src> <hostname> <dst>
diff -r a6cc7e1dbbd4 -r bd9b429c6d05 lib/PFTools/Net.pm
--- a/lib/PFTools/Net.pm Thu Nov 04 14:53:42 2010 +0100
+++ b/lib/PFTools/Net.pm Thu Nov 04 16:11:16 2010 +0100
@@ -1108,7 +1108,7 @@
next;
}
elsif ( ! defined $S->{'interface'}->{$i}->{'default'} ) {
- Warn( $ERR_SYNTAX, "No default vlan defined for interface ".$i." skipping this interface for host $mnam" ) ;
+ # Warn( $ERR_SYNTAX, "No default vlan defined for interface ".$i." skipping this interface for host $mnam" ) ;
next ;
}
else {
@@ -1257,7 +1257,7 @@
if ( defined $S->{$i}->{$r}->{$mnamindexnum} ) {
$M->{$act}->{$j}->{$r} = $S->{$i}->{$r}->{$mnamindexnum} ;
} elsif ( ! defined $S->{$i}->{$r}->{'default'} ) {
- Warn ( $ERR_SYNTAX, "No default route defined for interface ".$i." skipping this route for host $mnam" ) ;
+ # Warn ( $ERR_SYNTAX, "No default route defined for interface ".$i." skipping this route for host $mnam" ) ;
} else {
$M->{$act}->{$j}->{$r} = $S->{$i}->{$r}->{'default'} ;
}
diff -r a6cc7e1dbbd4 -r bd9b429c6d05 sbin/fix_hosts
--- a/sbin/fix_hosts Thu Nov 04 14:53:42 2010 +0100
+++ b/sbin/fix_hosts Thu Nov 04 16:11:16 2010 +0100
@@ -36,8 +36,6 @@
my $program = $0;
$program =~ s%.*/%%; # cheap basename
-my $version = sprintf( "svn-r%s", q$Revision$ =~ /([\d.]+)/ );
-
my $HOSTS_CFG = "/etc/hosts" ;
my $HOSTNAME = hostname ;
my $DEST = "-" ;
@@ -48,7 +46,7 @@
sub Display_usage () {
print STDERR << "# ENDHELP";
- $program - version $version
+ $program
Usage: $0 [options]
-h --help: print help and exit
diff -r a6cc7e1dbbd4 -r bd9b429c6d05 sbin/mk_grub2opt
--- a/sbin/mk_grub2opt Thu Nov 04 14:53:42 2010 +0100
+++ b/sbin/mk_grub2opt Thu Nov 04 16:11:16 2010 +0100
@@ -35,8 +35,6 @@
my $program = $0;
$program =~ s%.*/%%; # cheap basename
-my $version = sprintf( "svn-r%s", q$Revision: 714 $ =~ /([\d.]+)/ );
-
my $MENU_GRUB = "/etc/default/grub" ;
my $HOSTNAME = hostname ;
my $DEST = "-" ;
@@ -47,7 +45,7 @@
sub Display_usage () {
print STDERR << "# ENDHELP";
- $program - version $version
+ $program
Usage: $0 [options]
-h --help: print help and exit
diff -r a6cc7e1dbbd4 -r bd9b429c6d05 sbin/mk_grubopt
--- a/sbin/mk_grubopt Thu Nov 04 14:53:42 2010 +0100
+++ b/sbin/mk_grubopt Thu Nov 04 16:11:16 2010 +0100
@@ -35,8 +35,6 @@
my $program = $0;
$program =~ s%.*/%%; # cheap basename
-my $version = sprintf( "svn-r%s", q$Revision$ =~ /([\d.]+)/ );
-
my $MENU_GRUB = "/boot/grub/menu.lst" ;
my $HOSTNAME = hostname ;
my $DEST = "-" ;
@@ -47,7 +45,7 @@
sub Display_usage () {
print STDERR << "# ENDHELP";
- $program - version $version
+ $program
Usage: $0 [options]
-h --help: print help and exit
diff -r a6cc7e1dbbd4 -r bd9b429c6d05 sbin/mk_sourceslist
--- a/sbin/mk_sourceslist Thu Nov 04 14:53:42 2010 +0100
+++ b/sbin/mk_sourceslist Thu Nov 04 16:11:16 2010 +0100
@@ -50,14 +50,12 @@
my $program = $0;
$program =~ s%.*/%%; # cheap basename
-my $version = sprintf("svn-r%s", q$Revision$ =~ /([\d.]+)/);
-
sub Usage () {
print <<EOF
-$program - version $version
+$program
Synopsis : $program [-h|--help] [-s|--src <private-network source] [-d|--dst <sources.list dest>]
[ -t|--tpl <sources.list template>] [-b|--backports] [--host <hostname>] [[section] [section]]
diff -r a6cc7e1dbbd4 -r bd9b429c6d05 sbin/update-config
--- a/sbin/update-config Thu Nov 04 14:53:42 2010 +0100
+++ b/sbin/update-config Thu Nov 04 16:11:16 2010 +0100
@@ -31,11 +31,9 @@
my $program = $0;
$program =~ s%.*/%%; # cheap basename
-my $version = sprintf( "svn-r%s", q$Revision$ =~ /([\d.]+)/ );
-
sub Do_help {
print STDERR << "# ENDHELP";
- $program - version $version
+ $program
Usage: $0 [options]
-d --debug: print debug info
diff -r a6cc7e1dbbd4 -r bd9b429c6d05 tools/dumpiplist.pl
--- a/tools/dumpiplist.pl Thu Nov 04 14:53:42 2010 +0100
+++ b/tools/dumpiplist.pl Thu Nov 04 16:11:16 2010 +0100
@@ -39,7 +39,6 @@
my $read = 0 ;
my $program = $0;
$program =~ s%.*/%%; # cheap basename
-my $version = sprintf( "svn-r%s", q$Revision$ =~ /([\d.]+)/ );
sub _ipcomp {
my ( $a, $b ) = @_;
@@ -63,7 +62,7 @@
sub Do_help {
print STDERR << "# ENDHELP";
- $program - version $version
+ $program
Usage: $program [options]
-h --help: print help and exit
More information about the pf-tools-commits
mailing list