rpms/supermin
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Prefer 'dnf download' over 'yumdownloader'."

Browse Source 
dnf download still fundamentally broken:
https://bugzilla.redhat.com/show_bug.cgi?id=1186948

This reverts commit c1227497f2.
This commit is contained in:
Richard W.M. Jones 2015-04-10 19:01:27 +01:00
parent 2017028172
commit cac2bebd22
2 changed files with 6 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0001-rpm-Prefer-dnf-download-over-yumdownloader.patch
View File

@ -1,36 +0,0 @@
From baa22e783c31a693d95a2b7dd951ccc23663b831 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 16 Feb 2015 08:41:17 +0000
Subject: [PATCH] rpm: Prefer 'dnf download' over 'yumdownloader'.
Now that https://bugzilla.redhat.com/show_bug.cgi?id=1157233 has
been fixed, we can use 'dnf download' in parallel safely.
NB This requires hawkey >= 0.5.4 and dnf >= 0.6.5.
*Earlier versions will not work reliably*
---
src/rpm.ml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/rpm.ml b/src/rpm.ml
index 838c109..4d31472 100644
--- a/src/rpm.ml
+++ b/src/rpm.ml
@@ -285,10 +285,10 @@ let rpm_get_all_files pkgs =
let rec fedora_download_all_packages pkgs dir =
let tdir = !settings.tmpdir // string_random8 () in
- if Config.yumdownloader <> "no" then
- fedora_download_all_packages_with_yum pkgs dir tdir
- else (* Config.dnf <> "no" *)
- fedora_download_all_packages_with_dnf pkgs dir tdir;
+ if Config.dnf <> "no" then
+ fedora_download_all_packages_with_dnf pkgs dir tdir
+ else (* Config.yumdownloader <> "no" *)
+ fedora_download_all_packages_with_yum pkgs dir tdir;
rpm_unpack tdir dir
--
2.3.1

20
supermin.spec
View File

@ -6,7 +6,7 @@
Summary: Tool for creating supermin appliances
Name: supermin
Version: 5.1.12
Release: 8%{?dist}
Release: 9%{?dist}
License: GPLv2+
%if 0%{?rhel} >= 7
@ -16,17 +16,10 @@ ExclusiveArch: x86_64
URL: http://people.redhat.com/~rjones/supermin/
Source0: http://libguestfs.org/download/supermin/%{name}-%{version}.tar.gz
# Upstream patch to prefer 'dnf download' over yumdownloader.
# Since 'dnf download' was broken for a long time, this only works
# with the latest dnf (see dnf/hawkey version dependencies below).
Patch1: 0001-rpm-Prefer-dnf-download-over-yumdownloader.patch
BuildRequires: /usr/bin/pod2man
BuildRequires: rpm
BuildRequires: rpm-devel
BuildRequires: dnf >= 0.6.5-1.fc23
BuildRequires: dnf-plugins-core >= 0.1.6-2.fc23
BuildRequires: hawkey >= 0.5.4-1.fc23
BuildRequires: yum-utils
BuildRequires: /usr/sbin/mke2fs
BuildRequires: e2fsprogs-devel
BuildRequires: findutils
@ -39,9 +32,7 @@ BuildRequires: ocaml, ocaml-findlib-devel
BuildRequires: augeas hivex kernel tar
Requires: rpm
Requires: dnf >= 0.6.5-1.fc23
Requires: dnf-plugins-core >= 0.1.6-2.fc23
Requires: hawkey >= 0.5.4-1.fc23
Requires: yum-utils
Requires: util-linux-ng
Requires: cpio
Requires: tar
@ -85,8 +76,6 @@ from supermin appliances.
%prep
%setup -q
%patch1 -p1
%build
%configure --disable-network-tests
@ -129,6 +118,9 @@ make check || {
%changelog
* Fri Apr 10 2015 Richard W.M. Jones <rjones@redhat.com> - 5.1.12-9
- Revert back to yumdownloader (RHBZ#1186948).
* Fri Apr 3 2015 Richard W.M. Jones <rjones@redhat.com> - 5.1.12-8
- Prefer 'dnf download' over 'yumdownloader'.