vmukhame pushed to yum (master). "update to latest HEAD (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Mar 31 07:33:17 UTC 2015
>From 074468923b076c406f5fbdee38871fa752873364 Mon Sep 17 00:00:00 2001
From: Valentina Mukhamedzhanova <vmukhame at redhat.com>
Date: Tue, 31 Mar 2015 09:33:08 +0200
Subject: update to latest HEAD
- Make sure epoch is a string while checking for running kernel. BZ#1200159
- Fix rounding issue in required disk space message.
- Rename yum executable to yum-deprecated.
diff --git a/yum-HEAD.patch b/yum-HEAD.patch
index d5957d9..bee050f 100644
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@ -210807,3 +210807,73 @@ index 9f79f4f..0c7c535 100755
errcode = None
if 'YUM_PROF' in os.environ:
if os.environ['YUM_PROF'] == 'cprof':
+commit fe13d279bb14b9ad59f997b684b8660026d5103f
+Author: Valentina Mukhamedzhanova <vmukhame at redhat.com>
+Date: Mon Mar 2 15:32:23 2015 +0100
+
+ Change protected_multilib man page entry.
+
+diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
+index 272e07b..e0f4c8b 100644
+--- a/docs/yum.conf.5
++++ b/docs/yum.conf.5
+@@ -77,9 +77,10 @@ package corresponding to the running version of the kernel.
+ \fBprotected_multilib\fR
+ Either `1' or `0'. This tells yum whether or not it should perform a check to
+ make sure that multilib packages are the same version. For example, if this
+-option is off (rpm behaviour) pkgA-1.x86_64 and pkgA-2.i386 can be installed
+-at the same time. However this is very rarely desired.
+-Install only packages, like the kernel, are exempt from this check.
++option is off (rpm behavior) then in some cases it might be possible for
++pkgA-1.x86_64 and pkgA-2.i386 to be installed at the same time. However this
++is very rarely desired. Install only packages, like the kernel, are exempt
++from this check.
+ The default is `1'.
+
+ .IP
+commit fefb6a732e0c15c73300858c3fa7d7e89e79d18f
+Author: Valentina Mukhamedzhanova <vmukhame at redhat.com>
+Date: Wed Mar 11 10:52:49 2015 +0100
+
+ Make sure epoch is a string while checking for running kernel. BZ#1200159
+
+diff --git a/yum/misc.py b/yum/misc.py
+index 6850ae2..f72f028 100644
+--- a/yum/misc.py
++++ b/yum/misc.py
+@@ -818,6 +818,8 @@ def get_running_kernel_pkgtup(ts):
+ e = h['epoch']
+ if h['epoch'] is None:
+ e = '0'
++ else:
++ e = str(e)
+ return (h['name'], h['arch'], e, h['version'], h['release'])
+
+ return (None, None, None, None, None)
+commit 6ea8a6cf572efa7d7601dfc8535f5cc3cd80c3bd
+Author: Valentina Mukhamedzhanova <vmukhame at redhat.com>
+Date: Tue Mar 17 11:19:10 2015 +0100
+
+ Fix rounding issue in required disk space message.
+
+diff --git a/cli.py b/cli.py
+index cefc67e..9766f89 100755
+--- a/cli.py
++++ b/cli.py
+@@ -25,6 +25,7 @@ import sys
+ import time
+ import random
+ import logging
++import math
+ from optparse import OptionParser,OptionGroup,SUPPRESS_HELP
+ import rpm
+
+@@ -501,7 +502,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
+ p = re.compile('needs (\d+)(K|M)B on the (\S+) filesystem')
+ disk = {}
+ for m in p.finditer(errstring):
+- size_in_mb = int(m.group(1)) if m.group(2) == 'M' else round(int(m.group(1))/1024.0, 3)
++ size_in_mb = int(m.group(1)) if m.group(2) == 'M' else math.ceil(int(m.group(1))/1024.0)
+ if m.group(3) not in disk:
+ disk[m.group(3)] = size_in_mb
+ if disk[m.group(3)] < size_in_mb:
diff --git a/yum-deprecated.patch b/yum-deprecated.patch
new file mode 100644
index 0000000..73cfa5c
--- /dev/null
+++ b/yum-deprecated.patch
@@ -0,0 +1,29 @@
+diff --git a/Makefile b/Makefile
+index 9389aa8..a6b3974 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,7 +31,7 @@ install:
+ $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/usr/share/yum-cli', 1, '/usr/share/yum-cli', 1)"
+
+ mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/sbin
+- install -m 755 bin/yum.py $(DESTDIR)/usr/bin/yum
++ install -m 755 bin/yum.py $(DESTDIR)/usr/bin/yum-deprecated
+ install -m 755 bin/yum-updatesd.py $(DESTDIR)/usr/sbin/yum-updatesd
+
+ mkdir -p $(DESTDIR)/var/cache/yum
+diff --git a/bin/yum.py b/bin/yum.py
+index 7ccee31..01627f4 100755
+--- a/bin/yum.py
++++ b/bin/yum.py
+@@ -1,5 +1,11 @@
+ #!/usr/bin/python
+ import sys
++
++sys.stderr.write("""\
++Yum command has been deprecated, use dnf instead.
++See 'man dnf' and 'man yum2dnf' for more information.\n
++""")
++
+ try:
+ import yum
+ except ImportError:
diff --git a/yum.spec b/yum.spec
index 4fe5f0a..90b8991 100644
--- a/yum.spec
+++ b/yum.spec
@@ -64,7 +64,7 @@ BuildRequires: bash-completion
Summary: RPM package installer/updater/manager
Name: yum
Version: 3.4.3
-Release: 157%{?dist}
+Release: 505%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -76,6 +76,7 @@ Patch6: yum-HEAD.patch
Patch7: yum-ppc64-preferred.patch
Patch20: yum-manpage-files.patch
Patch21: yum-completion-helper.patch
+Patch22: yum-deprecated.patch
URL: http://yum.baseurl.org/
BuildArchitectures: noarch
@@ -111,6 +112,9 @@ Requires: pyxattr
Requires: diffutils
Requires: cpio
+# Replace Yum With DNF F22 Change
+Requires: dnf-yum
+Requires: dnf-plugins-extras-migrate
Conflicts: rpm >= 5-0
# Zif is a re-implementation of yum in C, however:
@@ -248,6 +252,7 @@ This runs after yum-cron-daily, if that is installed.
%patch7 -p1
%patch20 -p1
%patch21 -p1
+%patch22 -p1
%patch1 -p1
%build
@@ -447,7 +452,7 @@ exit 0
%if %{yum_updatesd}
%exclude %{_datadir}/yum-cli/yumupd.py*
%endif
-%{_bindir}/yum
+%{_bindir}/yum-deprecated
%{python_sitelib}/yum
%{python_sitelib}/rpmUtils
%dir /var/cache/yum
@@ -510,6 +515,12 @@ exit 0
%endif
%changelog
+* Tue Mar 31 2015 Valentina Mukhamedzhanova <vmukhame at redhat.com> - 3.4.3-505
+- update to latest HEAD
+- Make sure epoch is a string while checking for running kernel. BZ#1200159
+- Fix rounding issue in required disk space message.
+- Rename yum executable to yum-deprecated.
+
* Thu Mar 12 2015 James Antill <james at fedoraproject.org> - 3.4.3-157
- Hacky fix for recursion problem with cashe. BZ#1199315
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/yum.git/commit/?h=master&id=074468923b076c406f5fbdee38871fa752873364
More information about the scm-commits
mailing list