[Debpool-commits] [SCM] Debpool Project Repository branch, master, updated. 0.2.3-63-g38a32aa

[ceros-guest]

The following commit has been merged in the master branch:
commit d42dbb7813a8cd377d76ba245a94403700ac61bd
Author: ceros-guest <ceros-guest>
Date:   Tue Jan 8 07:32:02 2008 +0000

    Fixed a couple of problems with Config.pm

diff --git a/debian/changelog b/debian/changelog
index 866b87b..c59b9c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,8 +51,11 @@ debpool (0.2.4~unreleased0) experimental; urgency=low
   * Bumped Standards-Version to 3.7.3.
     + Removed 'binary-arch' target in debian/rules to silence new lintian
       warning.
+  * Fixed problem where 'release_noauto' could not be overridden.
+  * Use $ENV{'HOME'} instead of '/home/user' for specifying home directory
+    through environment variable in Config.pm.
 
- -- Andres Mejia <mcitadel at gmail.com>  Thu, 03 Jan 2008 00:58:20 -0500
+ -- Andres Mejia <mcitadel at gmail.com>  Tue, 08 Jan 2008 02:06:32 -0500
 
 debpool (0.2.3) experimental; urgency=low
 
diff --git a/share/DebPool/Config.pm b/share/DebPool/Config.pm
index 5d4a28f..4b9ae5b 100644
--- a/share/DebPool/Config.pm
+++ b/share/DebPool/Config.pm
@@ -699,9 +699,8 @@ Default value: [ 'experimental' ]
 
 =cut
 
-$Options{'release_noauto'} = [
-    'experimental',
-];
+$Options{'release_noauto'} = [ 'experimental' ];
+$OptionDefs{'release_noauto'} = 'release_noauto=s@';
 
 =back
 
@@ -792,11 +791,11 @@ $OptionDefs{'gpg_bin'} = 'gpg_bin=s';
 
 This is used to specify the GnuPG homedir (via the --homedir option).
 
-Default value: '/home/user/.gnupg'
+Default value: $ENV{'HOME'}.'/.gnupg'
 
 =cut
 
-$Options{'gpg_home'} = '/home/user/.gnupg';
+$Options{'gpg_home'} = $ENV{'HOME'}.'/.gnupg';
 $OptionDefs{'gpg_home'} = 'gpg_home=s';
 
 =item B<gpg_keyrings> = I<array of keyring filenames>
@@ -834,13 +833,13 @@ This specifies the name of the file from which we read the GnuPG passphrase
 for the key listed in gpg_sign_key. Note that it will have no effect unless
 'sign_release' is true and 'gpg_sign_key' is defined.
 
-Default value: '/home/user/.gnupg/passphrase';
+Default value: $ENV{'HOME'}.'/.gnupg/passphrase';
 
 See also: sign_release, gpg_sign_key
 
 =cut
 
-$Options{'gpg_passfile'} = '/home/user/.gnupg/passphrase';
+$Options{'gpg_passfile'} = $ENV{'HOME'}.'/.gnupg/passphrase';
 $OptionDefs{'gpg_passfile'} = 'gpg_passfile=s';
 
 =back
@@ -857,9 +856,11 @@ If this option is defined, logging output will be sent to the filename
 specified. Note that an undefined value is considered an explicit request
 to log nothing.
 
+Default value: $ENV{'HOME'}.'/.debpool/DebPool.log';
+
 =cut
 
-$Options{'log_file'} = '/home/user/.debpool/DebPool.log';
+$Options{'log_file'} = $ENV{'HOME'}.'/.debpool/DebPool.log';
 $OptionDefs{'log_file'} = 'log_file=s';
 
 =head2 Misc. configuration

-- 
Debpool Project Repository