[yum] update to latest HEAD
Valentina Mukhamedzhanova
vmukhame at fedoraproject.org
Wed Jan 8 10:55:21 UTC 2014
commit 63256eb563ef284b5f438cb658bb021c550576f0
Author: Valentina Mukhamedzhanova <vmukhame at redhat.com>
Date: Tue Jan 7 11:09:13 2014 +0100
update to latest HEAD
- Skip unavailable repos. BZ 1046076
- docs: yum.conf.5: Fix typo.
- docs: Update --downloadonly section of man page.
- Change emitCheckFailed() to a warning. BZ 1048391
yum-HEAD.patch | 60 +++++++++++++++++--------------------------------------
yum.spec | 9 +++++++-
2 files changed, 27 insertions(+), 42 deletions(-)
---
diff --git a/yum-HEAD.patch b/yum-HEAD.patch
index d77163e..ced5b99 100644
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@ -2796,7 +2796,7 @@ index 0000000..2af059d
+ the mailing list, yum at lists.baseurl.org, or consult bugzilla.
+.fi
diff --git a/docs/yum.8 b/docs/yum.8
-index 1a8202a..0e211eb 100644
+index 1a8202a..f7d6ec3 100644
--- a/docs/yum.8
+++ b/docs/yum.8
@@ -25,6 +25,8 @@ gnome\-packagekit application\&.
@@ -3466,7 +3466,7 @@ index 1a8202a..0e211eb 100644
.IP "\fB\-\-disableplugin=plugin\fP"
Run with one or more plugins disabled, the argument is a comma separated list
of wildcards to match against plugin names.
-@@ -506,7 +867,14 @@ option will corrupt your cache (and you can use $releasever in your cachedir
+@@ -506,7 +867,15 @@ option will corrupt your cache (and you can use $releasever in your cachedir
configuration to stop this).
.PP
.IP "\fB\-t, \-\-tolerant\fP"
@@ -3475,14 +3475,15 @@ index 1a8202a..0e211eb 100644
+making it more tolerant of external errors.
+.br
+.IP "\fB\-\-downloadonly\fP"
-+Don't update, just download.
++Don't update, just download. This is done in the background, so the yum lock is released for other operations. This can also be chosen by typing 'd'ownloadonly
++at the transaction confirmation prompt.
+.br
+.IP "\fB\-\-downloaddir=directory\fP"
+Specifies an alternate directory to store packages.
.br
.IP "\fB\-\-setopt=option=value\fP"
Set any config option in yum config or repo files. For options in the global
-@@ -523,7 +891,7 @@ version of the package\&.
+@@ -523,7 +892,7 @@ version of the package\&.
The format of the output of yum list is:
@@ -3491,7 +3492,7 @@ index 1a8202a..0e211eb 100644
.IP "\fByum list [all | glob_exp1] [glob_exp2] [\&.\&.\&.]\fP"
List all available and installed packages\&.
-@@ -542,6 +910,10 @@ shell\-style glob and any matches are printed\&.
+@@ -542,6 +911,10 @@ shell\-style glob and any matches are printed\&.
List the packages installed on the system that are not available in any yum
repository listed in the config file.
.IP
@@ -3502,7 +3503,7 @@ index 1a8202a..0e211eb 100644
.IP "\fByum list obsoletes [glob_exp1] [\&.\&.\&.]\fP"
List the packages installed on the system that are obsoleted by packages
in any yum repository listed in the config file.
-@@ -658,7 +1030,7 @@ configuration options.
+@@ -658,7 +1031,7 @@ configuration options.
.I yum-complete-transaction (1)
.I yumdownloader (1)
.I yum-utils (1)
@@ -3512,7 +3513,7 @@ index 1a8202a..0e211eb 100644
http://yum.baseurl.org/wiki/Faq
yum search yum
diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
-index 515aa73..48ced00 100644
+index 515aa73..c66eba8 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -64,7 +64,7 @@ options are: 'critical', 'emergency', 'error', 'warn' and 'debug'.
@@ -3571,7 +3572,7 @@ index 515aa73..48ced00 100644
\fBexclude\fR
-List of packages to exclude from updates or installs. This should be a space
+List of packages to exclude from all repositories, so yum works
-+as if that package was never in the repositories.. This should be a space
++as if that package was never in the repositories. This should be a space
separated list.
+This is commonly used so a package isn't upgraded or installed accidentally, but
+can be used to remove packages in any way that "yum list" will show packages.
@@ -184663,10 +184664,10 @@ index 0000000..28e1964
+- Check if we're running as root; exit nicely.
diff --git a/yum-cron/yum-cron.py b/yum-cron/yum-cron.py
new file mode 100755
-index 0000000..a1fd10b
+index 0000000..386a7a0
--- /dev/null
+++ b/yum-cron/yum-cron.py
-@@ -0,0 +1,721 @@
+@@ -0,0 +1,698 @@
+#!/usr/bin/python -tt
+import os
+import sys
@@ -184755,17 +184756,6 @@ index 0000000..a1fd10b
+ % errmsg)
+ self.sendMessages()
+
-+ def lockFailed(self, errmsg):
-+ """Append a message to the output list stating that the
-+ program failed to acquire the yum lock, then call sendMessages
-+ to emit the output.
-+
-+ :param errmsg: a string that contains the error message
-+ """
-+ self.output.append("Failed to acquire the yum lock with the following error message: \n%s"
-+ % errmsg)
-+ self.sendMessages()
-+
+ def checkFailed(self, errmsg):
+ """Append a message to the output stating that checking for
+ updates failed, then call sendMessages to emit the output.
@@ -184865,16 +184855,6 @@ index 0000000..a1fd10b
+ self.subject = "Yum: Failed to perform setup on %s" % self.opts.system_name
+ super(EmailEmitter, self).setupFailed(errmsg)
+
-+ def lockFailed(self, errmsg):
-+ """Append a message to the output list stating that the
-+ program failed to acquire the yum lock, then call sendMessages
-+ to emit the output, and set an appropriate subject line.
-+
-+ :param errmsg: a string that contains the error message
-+ """
-+ self.subject = "Yum: Failed to acquire the yum lock on %s" % self.opts.system_name
-+ super(EmailEmitter, self).lockFailed(errmsg)
-+
+ def checkFailed(self, errmsg):
+ """Append a message to the output stating that checking for
+ updates failed, then call sendMessages to emit the output, and
@@ -185049,16 +185029,16 @@ index 0000000..a1fd10b
+ self.preconf.fn = self.opts.yum_config_file
+
+ # This needs to be set early, errors are handled later.
-+ try: self.preconf.debuglevel = int(self._confparser.get('base', 'debuglevel'))
-+ except: pass
++ try: level = int(self._confparser.get('base', 'debuglevel'))
++ except: level = -2
++ self.preconf.debuglevel = level
++ if -4 <= level <= -2:
++ self.preconf.errorlevel = level + 4
+
+ # if we are not root do the special subdir thing
+ if os.geteuid() != 0:
+ self.setCacheDir()
+
-+ # Create the configuration
-+ self.conf
-+
+ # override base yum options
+ self.conf.populate(self._confparser, 'base')
+ del self._confparser
@@ -185075,7 +185055,7 @@ index 0000000..a1fd10b
+ try:
+ self.doLock()
+ except yum.Errors.LockError, e:
-+ self.emitLockFailed("%s" % e)
++ self.logger.warn("Failed to acquire the yum lock: %s", e)
+ sys.exit(1)
+
+ def populateUpdateMetadata(self):
@@ -185083,7 +185063,9 @@ index 0000000..a1fd10b
+
+ for repo in self.repos.sort():
+ repo.metadata_expire = 0
++ repo.skip_if_unavailable = True
+
++ self.pkgSack # honor skip_if_unavailable
+ self.upinfo
+
+ def refreshUpdates(self):
@@ -185342,10 +185324,6 @@ index 0000000..a1fd10b
+ """Emit a notice stating that checking for updates failed."""
+ map(lambda x: x.setupFailed(error), self.emitters)
+
-+ def emitLockFailed(self, errmsg):
-+ """Emit a notice that we failed to acquire the yum lock."""
-+ map(lambda x: x.lockFailed(errmsg), self.emitters)
-+
+ def emitCheckFailed(self, error):
+ """Emit a notice stating that checking for updates failed."""
+ map(lambda x: x.checkFailed(error), self.emitters)
diff --git a/yum.spec b/yum.spec
index 208c246..d885849 100644
--- a/yum.spec
+++ b/yum.spec
@@ -60,7 +60,7 @@ BuildRequires: bash-completion
Summary: RPM package installer/updater/manager
Name: yum
Version: 3.4.3
-Release: 128%{?dist}
+Release: 129%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -444,6 +444,13 @@ exit 0
%endif
%changelog
+* Tue Jan 7 2014 Valentina Mukhamedzhanova <vmukhame at redhat.com> - 3.4.3-129
+- update to latest HEAD
+- Skip unavailable repos. BZ 1046076
+- docs: yum.conf.5: Fix typo.
+- docs: Update --downloadonly section of man page.
+- Change emitCheckFailed() to a warning. BZ 1048391
+
* Fri Dec 19 2013 James Antill <james at fedoraproject.org> - 3.4.3-128
- update to latest HEAD
- Fix for traceback with group info -v.
More information about the scm-commits
mailing list