pf-tools/pf-tools: 2 new changesets

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

changeset 7f26f25b8b21 in /srv/hg.debian.org/hg/pf-tools/pf-tools
details: http://hg.debian.org/hg/pf-tools/pf-tools?cmd=changeset;node=7f26f25b8b21
summary: Cosmectic

changeset 63e4124df9d5 in /srv/hg.debian.org/hg/pf-tools/pf-tools
details: http://hg.debian.org/hg/pf-tools/pf-tools?cmd=changeset;node=63e4124df9d5
summary: changelog

diffstat:

3 files changed, 1 insertion(+), 5 deletions(-)
debian/changelog     |    1 +
lib/PFTools/Utils.pm |    2 --
sbin/mk_grubopt      |    3 ---

diffs (91 lines):

diff -r 7eb4c2c22b1a -r 63e4124df9d5 debian/changelog
--- a/debian/changelog	Mon Sep 13 12:02:07 2010 +0200
+++ b/debian/changelog	Mon Sep 13 22:21:10 2010 +0200
@@ -23,8 +23,9 @@
   * IO::File on Addmount (see README.coding.style) 
   * using Module::Runtime in Packages.pm and creating Packages::DEB
   * correctly handle an undefined pf-tools configuration when checking out 
+  * style for handling options for sbin/*
 
- -- Christophe Caillet <quadchris at free.fr>  Mon, 13 Sep 2010 11:19:49 +0200
+ -- Christophe Caillet <quadchris at free.fr>  Mon, 13 Sep 2010 12:00:47 +0200
 
 pf-tools (1.0-1) unstable; urgency=low
 
diff -r 7eb4c2c22b1a -r 63e4124df9d5 lib/PFTools/Utils.pm
--- a/lib/PFTools/Utils.pm	Mon Sep 13 12:02:07 2010 +0200
+++ b/lib/PFTools/Utils.pm	Mon Sep 13 22:21:10 2010 +0200
@@ -1,6 +1,4 @@
 package PFTools::Utils;
-##
-##  $Id$
 ##
 ##  Copyright (C) 2010 Christophe Caillet <quadchris at free.fr>
 ##
@@ -86,8 +84,9 @@
         $pf_config = Init_PF_CONFIG();
     }
 
-    $global_store_file = $pf_config->{'path'}->{'global_struct'}
-        if ( $global_store_file eq '' );
+    unless ( $global_store_file ) {
+        $global_store_file = $pf_config->{'path'}->{'global_struct'};
+    }
     if ( !-e $global_store_file || $reload ) {
         my $source
             = Get_source( 'COMMON:/' . $pf_config->{'path'}->{'start_file'},
diff -r 7eb4c2c22b1a -r 63e4124df9d5 sbin/mk_grubopt
--- a/sbin/mk_grubopt	Mon Sep 13 12:02:07 2010 +0200
+++ b/sbin/mk_grubopt	Mon Sep 13 22:21:10 2010 +0200
@@ -1,10 +1,6 @@
 #!/usr/bin/perl
 ##
-##  $Id$
-##
-##  Copyright (C) 2007-2008 Christophe Caillet <quadchris at free.fr>
-##  Copyright (C) 2003-2005 Damien Clermonte <damien at sitadelle.com>
-##  Copyright (C) 2001-2003 Olivier Molteni <olivier at molteni.net>
+##  Copyright (C) 2007-2010 Christophe Caillet <quadchris at free.fr>
 ##
 ##  This program is free software; you can redistribute it and/or
 ##  modify it under the terms of the GNU General Public License
@@ -35,6 +31,24 @@
 ####################################################
 # Vars
 
+my @options_specs = (
+    'help',
+    'host|h=s',
+    'site|s=s',
+    'src=s',
+    'grub=s',
+    'output|o=s',
+    'config|c=s',
+    'store=s',
+);
+
+my $options = {
+    'config'    => '',
+    'help'      => 0,
+    'grub'      => 2,
+    'src'       => '',
+};
+
 my $GRUB_VERSION      = 2;
 my $MENU_GRUB         = "";
 my $HOSTNAME          = "";
@@ -49,14 +63,11 @@
 my $program = $0;
 $program =~ s%.*/%%;    # cheap basename
 
-my $version = sprintf( "svn-r%s", q$Revision$ =~ /([\d.]+)/ );
-
 ######################################################
 # Functions
 
 sub Do_help () {
     print STDERR << "# ENDHELP";
-    $program - version $version
 
 Usage:	$program [options]
 	-h --help	: print help and exit