[yum-git] Branch 'yum-3_2_X' - cli.py yum/config.py yum/__init__.py

[James Antill]

 cli.py          |    4 ++--
 yum/__init__.py |    2 +-
 yum/config.py   |   12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit b139e3112f5bcfdd72b74ebe0619cd028e327f0c
Author: James Antill <james at and.org>
Date:   Mon Jul 28 18:03:34 2008 -0400

    Remove the assoc. of gpgcheck=1/true meaning gpgcheck=all

diff --git a/cli.py b/cli.py
index 4dda42c..179970d 100644
--- a/cli.py
+++ b/cli.py
@@ -1079,9 +1079,9 @@ class YumOptionParser(OptionParser):
 
             # Disable all gpg key checking, if requested.
             if opts.nogpgcheck:
-                self.base.conf.gpgcheck = 'false'
+                self.base.conf.gpgcheck = 'none'
                 for repo in self.base.repos.listEnabled():
-                    repo.gpgcheck = 'false'
+                    repo.gpgcheck = 'none'
                             
         except ValueError, e:
             self.logger.critical(_('Options Error: %s'), e)
diff --git a/yum/__init__.py b/yum/__init__.py
index 2801fb1..874a54e 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1226,7 +1226,7 @@ class YumBase(depsolve.Depsolve):
             check = repo.gpgcheck
             hasgpgkey = not not repo.gpgkey 
         
-        if check in ('true', 'packages'):
+        if check in ('all', 'packages'):
             ts = self.rpmdb.readOnlyTS()
             sigresult = rpmUtils.miscutils.checkSig(ts, po.localPkg())
             localfn = os.path.basename(po.localPkg())
diff --git a/yum/config.py b/yum/config.py
index 6354ee3..5904638 100644
--- a/yum/config.py
+++ b/yum/config.py
@@ -624,12 +624,12 @@ class YumConf(StartupConf):
     diskspacecheck = BoolOption(True)
     overwrite_groups = BoolOption(False)
     keepalive = BoolOption(True)
-    gpgcheck = CaselessSelectionOption('false',
-                                       ('false', 'true', 'packages', 'repo'),
-                                       {'0'          : 'false',
-                                        'no'         : 'false',
-                                        '1'          : 'true',
-                                        'yes'        : 'true',
+    gpgcheck = CaselessSelectionOption('none',
+                                       ('none', 'all', 'packages', 'repo'),
+                                       {'0'          : 'none',
+                                        'no'         : 'none',
+                                        '1'          : 'all',
+                                        'yes'        : 'all',
                                         'pkgs'       : 'packages',
                                         'repository' : 'repo'})
     obsoletes = BoolOption(False)