Attachment 838031 Details for Bug 1040689 – hack around the problem

[patch] hack around the problem

fedup_patch.git (text/plain), 2.30 KB, created by Adam Williamson on 2013-12-17 23:26:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Williamson

Created: 2013-12-17 23:26:03 UTC

Size: 2.30 KB

patch

obsolete

>diff --git a/fedup.py b/fedup.py
>index f2ac832..728f59b 100755
>--- a/fedup.py
>+++ b/fedup.py
>@@ -117,7 +117,7 @@ def main(args):
>                          enable_plugins=args.enable_plugins,
>                          disable_plugins=args.disable_plugins)
> 
>-    if args.nogpgcheck:
>+    if args.gpgcheck:
>         f._override_sigchecks = True
> 
>     if args.expire_cache:
>diff --git a/fedup/commandline.py b/fedup/commandline.py
>index b85f496..f2a47ab 100644
>--- a/fedup/commandline.py
>+++ b/fedup/commandline.py
>@@ -66,7 +66,7 @@ def parse_args(gui=False):
>     yumopts.add_argument('--disableplugin', metavar='PLUGIN',
>         action='append', dest='disable_plugins', default=[],
>         help=_('disable yum plugins by name'))
>-    yumopts.add_argument('--nogpgcheck', action='store_true', default=False,
>+    yumopts.add_argument('--gpgcheck', action='store_true', default=False,
>         help=_('disable GPG signature checking'))
> 
> 
>diff --git a/fedup/download.py b/fedup/download.py
>index 3c86b6e..db54083 100644
>--- a/fedup/download.py
>+++ b/fedup/download.py
>@@ -229,7 +229,7 @@ class UpgradeDownloader(yum.YumBase):
>             # Enable async downloads, if possible (see yum/__init__.py)
>             repo._async = repo.async
> 
>-            # Disable gpg key checking for the repos, if requested
>+            # Enable gpg key checking for the repos, if requested
>             if self._override_sigchecks:
>                 repo._override_sigchecks = True
> 
>@@ -355,7 +355,7 @@ class UpgradeDownloader(yum.YumBase):
>             log.debug("using cached .treeinfo %s", outfile)
>             return outfile
> 
>-        if self.instrepo.gpgcheck and not self._override_sigchecks:
>+        if self.instrepo.gpgcheck and self._override_sigchecks:
>             log.debug("fetching .treeinfo.signed from '%s'", self.instrepoid)
>             fn = self.instrepo.grab.urlgrab('.treeinfo.signed',
>                                             outfile+'.signed',
>@@ -580,7 +580,7 @@ class UpgradeDownloader(yum.YumBase):
>         keys imported and has its own signature verification code, but AFAICT
>         it doesn't (at least not in any way reachable from Python), so..
>         '''
>-        if self._override_sigchecks:
>+        if not self._override_sigchecks:
>             return []
> 
>         # set up our own GPG keyring containing all the trusted keys

Actions: View | Diff

Attachments on bug 1040689: 838031 | 838317