[yum-commits] 3 commits - docs/yum.8 docs/yum.conf.5 yum/drpm.py

[zpavlas at osuosl.org]

 docs/yum.8      |   10 +++++++---
 docs/yum.conf.5 |    6 ------
 yum/drpm.py     |    7 +++++--
 3 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit d78b1258ec9fd8ed312c4fede9a68db1623bb124
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Mon Nov 11 08:58:52 2013 +0100

    docs: exactarch option is removed.

diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
index 5d8578d..53cef2e 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -158,12 +158,6 @@ Can be disabled using --disableexcludes.
 Command-line option: \fB\-x\fP
 
 .IP
-\fBexactarch\fR
-Either `1' or `0'. Set to `1' to make yum update only update the architectures
-of packages that you have installed. ie: with this enabled yum will not install
-an i686 package to update an i386 package. Default is `1'.
-
-.IP
 \fBinstallonlypkgs \fR
 List of package provides that should only ever be installed, never updated.
 Kernels in particular fall into this category. Defaults to kernel,
commit 1b14f27c1ff77ca3fb0af7dccc890a6c8bf36d42
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Wed Nov 6 14:42:59 2013 +0100

    docs: Suggest "--" when using "-<pkg>" to exclude packages. BZ 1026598

diff --git a/docs/yum.8 b/docs/yum.8
index e42bf49..2cbdf72 100644
--- a/docs/yum.8
+++ b/docs/yum.8
@@ -103,9 +103,13 @@ satisfied\&.  (See \fBSpecifying package names\fP for more information)
 If no package matches the given package name(s), they are assumed to be a shell 
 glob and any matches are then installed\&. If the name starts with @^ then it
 is treated as an environment group (group install @^foo), an @ character and
-it's treated as a group (plain group install)\&. If the name starts with
-a - character, then a search is done within
-the transaction and any matches are removed. If the name is a file, then install works
+it's treated as a group (plain group install)\&.
+
+If the name starts with a "-" character, then a search is done within the
+transaction and any matches are removed. Note that Yum options use the same
+syntax and it may be necessary to use "--" to resolve any possible conflicts.
+
+If the name is a file, then install works
 like localinstall\&. If the name doesn't match a package, then package
 "provides" are searched (e.g. "_sqlitecache.so()(64bit)") as are
 filelists (Eg. "/usr/bin/yum"). Also note that for filelists, wildcards will
commit b6edcf9ee729129a28783b086f50bc443e98a408
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Fri Nov 8 10:28:22 2013 +0100

    applydeltarpm: turn fork() failure to MiscError. BZ 1028334
    
    This is fatal, ignoring or retrying spawnl() makes no sense.
    Just turn OSError to MiscError to avoid traceback, and make
    it a bit more descriptive.

diff --git a/yum/drpm.py b/yum/drpm.py
index d00cf1c..1fd7a11 100644
--- a/yum/drpm.py
+++ b/yum/drpm.py
@@ -18,7 +18,7 @@
 #      Boston, MA  02111-1307  USA
 
 from yum.constants import TS_UPDATE
-from yum.Errors import RepoError
+from yum.Errors import RepoError, MiscError
 from yum.i18n import exception2msg, _
 from yum.Errors import MiscError
 from yum.misc import checksum, repo_gen_decompress, unlink_f
@@ -334,6 +334,9 @@ class DeltaInfo:
         if po.oldrpm: args += '-r', po.oldrpm
         args += po.localpath, po.rpm.localpath
 
-        pid = os.spawnl(os.P_NOWAIT, APPLYDELTA, APPLYDELTA, *args)
+        try:
+            pid = os.spawnl(os.P_NOWAIT, APPLYDELTA, APPLYDELTA, *args)
+        except OSError, e:
+            raise MiscError, _('Couldn\'t spawn %s: %s') % (APPLYDELTA, exception2msg(e))
         self.jobs[pid] = po
         return True