[yum-commits] Branch 'yum-3_2_X' - cli.py docs/yum.conf.5 yum/config.py yum/__init__.py

[skvidal at osuosl.org]

 cli.py          |    1 +
 docs/yum.conf.5 |   10 +++++++---
 yum/__init__.py |    2 +-
 yum/config.py   |    1 +
 4 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 290933489b1aaeb1017d10fb59ccf3231e309115
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Sep 30 16:28:30 2010 -0400

    add localpkg_gpgcheck option to [main] so users can set whether or not
    to gpgcheck pkgs in local files
    
    documents it too

diff --git a/cli.py b/cli.py
index f566f88..f667b46 100644
--- a/cli.py
+++ b/cli.py
@@ -1465,6 +1465,7 @@ class YumOptionParser(OptionParser):
             if opts.nogpgcheck:
                 self.base.conf.gpgcheck      = False
                 self.base.conf.repo_gpgcheck = False
+                self.base.conf.localpkg_gpgcheck = False                
                 for repo in self.base.repos.listEnabled():
                     repo.gpgcheck      = False
                     repo.repo_gpgcheck = False
diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
index a5bd519..b48bdf6 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -80,9 +80,13 @@ Full directory and file name for where yum should write its log file.
 \fBgpgcheck\fR
 Either `1' or `0'. This tells yum whether or not it should perform a GPG
 signature check on packages. When this is set in the [main] section it sets the
-default for all repositories. This option also determines whether or not an
-install of a package from a local RPM file will be GPG signature checked. The
-default is `0'.
+default for all repositories. 
+The default is `0'.
+
+\fBlocalpkg_gpgcheck\fR
+Either `1' or `0'. This tells yum whether or not it should perform a GPG
+signature check on local packages (packages in a file, not in a repositoy).
+The default is `0'.
 
 .IP
 \fBrepo_gpgcheck\fR
diff --git a/yum/__init__.py b/yum/__init__.py
index afe5354..de5f257 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1937,7 +1937,7 @@ class YumBase(depsolve.Depsolve):
             - 2 - Fatal GPG verification error, give up.
         '''
         if hasattr(po, 'pkgtype') and po.pkgtype == 'local':
-            check = self.conf.gpgcheck
+            check = self.conf.localpkg_gpgcheck
             hasgpgkey = 0
         else:
             repo = self.repos.getRepo(po.repoid)
diff --git a/yum/config.py b/yum/config.py
index 49411e3..2118792 100644
--- a/yum/config.py
+++ b/yum/config.py
@@ -673,6 +673,7 @@ class YumConf(StartupConf):
     # FIXME: rename gpgcheck to pkgs_gpgcheck
     gpgcheck = BoolOption(__pkgs_gpgcheck_default__)
     repo_gpgcheck = BoolOption(__repo_gpgcheck_default__)
+    localpkg_gpgcheck = BoolOption(__pkgs_gpgcheck_default__)
     obsoletes = BoolOption(True)
     showdupesfromrepos = BoolOption(False)
     enabled = BoolOption(True)