File 0001-Fix-traceback-when-local-rpm-url-is-passed... of Package dnf-plugins-core

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-traceback-when-local-rpm-url-is-passed.patch of Package dnf-plugins-core (Revision b47753dc18459732cffac7f5edb40fa9)

Currently displaying revision b47753dc18459732cffac7f5edb40fa9 , Show latest

From 2d61e843048d49052af93e377796a3b850cdf89c Mon Sep 17 00:00:00 2001
From: Marek Blaha <mblaha@redhat.com>
Date: Thu, 13 Dec 2018 08:19:40 +0100
Subject: [PATCH 1/3] Fix traceback when local rpm / url is passed

$ dnf download acpi-1.7-9.fc28.x86_64.rpm
Last metadata expiration check: 0:20:41 ago on Thu 25 Oct 2018 01:27:34 AM EDT.
Traceback (most recent call last):
  File "/usr/bin/dnf", line 98, in <module>
    main.user_main(MAPPING[command] + args, exit_code=True)
  File "/usr/lib/python3.6/site-packages/dnf/cli/main.py", line 179, in user_main
    errcode = main(args)
  File "/usr/lib/python3.6/site-packages/dnf/cli/main.py", line 64, in main
    return _main(base, args, cli_class, option_parser_class)
  File "/usr/lib/python3.6/site-packages/dnf/cli/main.py", line 99, in _main
    return cli_run(cli, base)
  File "/usr/lib/python3.6/site-packages/dnf/cli/main.py", line 115, in cli_run
    cli.run()
  File "/usr/lib/python3.6/site-packages/dnf/cli/cli.py", line 1055, in run
    return self.command.run()
  File "/usr/lib/python3.6/site-packages/dnf-plugins/download.py", line 116, in run
    self._do_downloads(pkgs)  # download rpms
  File "/usr/lib/python3.6/site-packages/dnf-plugins/download.py", line 128, in _do_downloads
    pkg_list.sort(key=lambda x: (x.repo.priority, x.repo.cost))
  File "/usr/lib/python3.6/site-packages/dnf-plugins/download.py", line 128, in <lambda>
    pkg_list.sort(key=lambda x: (x.repo.priority, x.repo.cost))
  File "/usr/lib/python3.6/site-packages/dnf/package.py", line 158, in repo
    return self.base.repos[self.reponame]
KeyError: '@commandline'

https://bugzilla.redhat.com/show_bug.cgi?id=1642791
---
 plugins/download.py    | 42 ++++++++++++++++++++++++++++++------------
 tests/support.py       |  1 +
 tests/test_download.py | 10 +++++-----
 3 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/plugins/download.py b/plugins/download.py
index 91a66b9..792c828 100644
--- a/plugins/download.py
+++ b/plugins/download.py
@@ -103,14 +103,16 @@ class DownloadCommand(dnf.cli.Command):
         # If user asked for just urls then print them and we're done
         if self.opts.url:
             for pkg in pkgs:
-                url = pkg.remote_location(schemes=self.opts.urlprotocols)
-                if url:
-                    print(url)
-                else:
-                    msg = _("Failed to get mirror for package: %s") % pkg.name
-                    if self.base.conf.strict:
-                        raise dnf.exceptions.Error(msg)
-                    logger.warning(msg)
+                # command line repo packages do not have .remote_location
+                if pkg.repoid != hawkey.CMDLINE_REPO_NAME:
+                    url = pkg.remote_location(schemes=self.opts.urlprotocols)
+                    if url:
+                        print(url)
+                    else:
+                        msg = _("Failed to get mirror for package: %s") % pkg.name
+                        if self.base.conf.strict:
+                            raise dnf.exceptions.Error(msg)
+                        logger.warning(msg)
             return
         else:
             self._do_downloads(pkgs)  # download rpms
@@ -124,11 +126,28 @@ class DownloadCommand(dnf.cli.Command):
             pkg_dict.setdefault(str(pkg), []).append(pkg)
 
         to_download = []
+        cmdline = []
         for pkg_list in pkg_dict.values():
+            pkgs_cmdline = [pkg for pkg in pkg_list
+                            if pkg.repoid == hawkey.CMDLINE_REPO_NAME]
+            if pkgs_cmdline:
+                cmdline.append(pkgs_cmdline[0])
+                continue
             pkg_list.sort(key=lambda x: (x.repo.priority, x.repo.cost))
             to_download.append(pkg_list[0])
-        self.base.download_packages(to_download, self.base.output.progress)
-        locations = sorted([pkg.localPkg() for pkg in to_download])
+        if to_download:
+            self.base.download_packages(to_download, self.base.output.progress)
+        if cmdline:
+            # command line repo packages are either local files or already downloaded urls
+            # just copy them to the destination
+            for pkg in cmdline:
+                # python<3.4 shutil module does not raise SameFileError, check manually
+                src = pkg.localPkg()
+                dst = os.path.join(self.base.conf.destdir, os.path.basename(src))
+                if os.path.samefile(src, dst):
+                    continue
+                shutil.copy(src, self.base.conf.destdir)
+        locations = sorted([pkg.localPkg() for pkg in to_download + cmdline])
         return locations
 
     def _get_pkg_objs_rpms(self, pkg_specs):
@@ -236,8 +255,7 @@ class DownloadCommand(dnf.cli.Command):
         is_url = schemes and schemes in ('http', 'ftp', 'file', 'https')
         if is_url or (pkg_spec.endswith('.rpm') and os.path.isfile(pkg_spec)):
             pkgs = self.base.add_remote_rpms([pkg_spec], progress=self.base.output.progress)
-            pkg_spec = "{0.name}-{0.epoch}:{0.version}-{0.release}.{0.arch}".format(pkgs[0])
-
+            return self.base.sack.query().filterm(pkg=pkgs)
         subj = dnf.subject.Subject(pkg_spec)
         q = subj.get_best_query(self.base.sack)
         q = q.available()
diff --git a/tests/support.py b/tests/support.py
index 01825ae..c98651d 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -211,6 +211,7 @@ class PkgStub:
         self.release = r
         self.arch = a
         self.epoch = e
+        self.repoid = repo_id
         self.reponame = repo_id
         self.src_name = src_name
         self.repo = repo
diff --git a/tests/test_download.py b/tests/test_download.py
index 3af234e..d0d64fb 100644
--- a/tests/test_download.py
+++ b/tests/test_download.py
@@ -70,6 +70,10 @@ class QueryStub(object):
         self._filter = kwargs
         return self
 
+    def filterm(self, **kwargs):
+        self._filter = kwargs
+        return self
+
     def _stub_filter(self, **kwargs):
         results = self._all
 
@@ -262,11 +266,7 @@ class DownloadCommandTest(unittest.TestCase):
     def test_get_query_with_local_rpm(self):
         try:
             (fs, rpm_path) = tempfile.mkstemp('foobar-99.99-1.x86_64.rpm')
-            # b/c self.cmd.cli.base.add_remote_rpms is a mock object it
-            # will not update the available packages while testing.
-            # it is expected to hit this exception
-            with self.assertRaises(dnf.exceptions.PackageNotFoundError):
-                self.cmd._get_query(rpm_path)
+            self.cmd._get_query(rpm_path)
             self.cmd.cli.base.add_remote_rpms.assert_called_with([rpm_path], progress=None)
         finally:
             os.remove(rpm_path)
-- 
2.20.1

Places

File 0001-Fix-traceback-when-local-rpm-url-is-passed.patch of Package dnf-plugins-core (Revision b47753dc18459732cffac7f5edb40fa9)

Places