[yum-commits] 4 commits - docs/yum-utils.1 repoquery.py yum-config-manager.py

[James Antill]

 docs/yum-utils.1      |    3 ++-
 repoquery.py          |   11 +++++++++++
 yum-config-manager.py |    2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit d3099c4d3310b3b8d0769082b2559d076cf837b1
Merge: 9f7ba50 5461817
Author: James Antill <james at and.org>
Date:   Thu Jan 31 15:53:47 2013 -0500

    Merge branch 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum-utils
    
    * 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum-utils: (11 commits)
      make rpmlint less noisy
      ...

commit 9f7ba50b33c0b02631c54fbefb1fbb8c7053a6d5
Author: James Antill <james at and.org>
Date:   Thu Jan 31 13:38:27 2013 -0500

     Fix for --enablerepo=broken problem, exit(1) on failures and give reason.
    
     Also make queryError() an exit 1 condition.

diff --git a/repoquery.py b/repoquery.py
index a854c23..45c6826 100755
--- a/repoquery.py
+++ b/repoquery.py
@@ -425,6 +425,8 @@ class pkgQuery:
                     providers = matches.keys()
 
 
+            except yum.Errors.RepoError:
+                raise
             except yum.Errors.YumBaseError, err:
                 print >>sys.stderr, "No package provides %s" % req
                 return []
@@ -595,6 +597,8 @@ class pkgQuery:
                         arequirers = [pkg for pkg in areqs
                                       if pkg.pkgtup not in skip]
 
+            except yum.Errors.RepoError:
+                raise
             except yum.Errors.YumBaseError, err:
                 print >>sys.stderr, "No package provides %s" % str(prov)
                 return []
@@ -879,6 +883,8 @@ class YumBaseQuery(yum.YumBase):
             matches = yum.YumBase.searchPackageProvides(self, [str(depstring)])
             provider = matches.keys()
             # provider.extend(yum.YumBase.returnPackagesByDep(self, depstring))
+        except yum.Errors.RepoError:
+            raise
         except yum.Errors.YumBaseError, err:
             self.logger.error("No package provides %s" % depstring)
         return self.queryPkgFactory(provider)
@@ -1501,10 +1507,15 @@ def main(args):
     except (yum.Errors.RepoError, yum.Errors.GroupsError), e:
         repoq.logger.error(e)
         sys.exit(1)
+
     try:
         repoq.runQuery(regexs)
+    except yum.Errors.RepoError, e:
+        repoq.logger.error(e)
+        sys.exit(1)
     except queryError, e:
         repoq.logger.error(e)
+        sys.exit(1)
 
 if __name__ == "__main__":
     misc.setup_locale()
commit 2fb52f7c492f22604c35d7ddf49f69c3ea43ccc3
Author: James Antill <james at and.org>
Date:   Thu Sep 27 15:04:49 2012 -0400

    Only save changes to items in --setopts, with --save.

diff --git a/yum-config-manager.py b/yum-config-manager.py
index 50f5123..aed64a2 100755
--- a/yum-config-manager.py
+++ b/yum-config-manager.py
@@ -153,7 +153,7 @@ if (not args and not opts.addrepo) or 'main' in args:
         ybc = yb.conf
         writeRawConfigFile(fn, 'main', ybc.yumvar,
                            ybc.cfg.options, ybc.iteritems, ybc.optionobj,
-                           only)
+                           only=yb.main_setopts.items)
 
 if opts.enable or opts.disable:
     opts.save = True
commit 3a45c40664d0f7a5824f21fb1362c9eb11572246
Author: Shawn Starr <shawn.starr at rogers.com>
Date:   Thu Sep 27 15:03:17 2012 -0400

    Add a couple of missing commands to the yum-utils man page.

diff --git a/docs/yum-utils.1 b/docs/yum-utils.1
index fa830b6..fdfbe24 100644
--- a/docs/yum-utils.1
+++ b/docs/yum-utils.1
@@ -15,6 +15,7 @@ yum\-utils \- tools for manipulating repositories and extended package managemen
 \fBrepoquery\fR \- query yum repositories and get additional information on the them
 \fBreposync\fR \- synchronize a remote yum repository to a local directory using yum to retrieve packages
 \fBrepotrack\fR \- track packages and its dependencies and downloads them
+\fBshow-changed-rco\fR \- list of changes to a package Requires, Conflicts and Obsoletes data from installed to a specified rpm file
 \fBshow-installed\fR \- gives a compact description of packages installed and makes use of comps groups in repositories
 \fBverifytree\fR - verify that a local yum repository is consistent
 \fByum\-builddep\fR \- installs missing dependencies to build a specified package
@@ -32,6 +33,6 @@ is a collection of tools and programs for managing yum repositories, installing
 .SH "NOTES"
 See respective tools for additional help for commands without a manual page
 .SH "SEE ALSO"
-debuginfo\-install(1), package\-cleanup(1), repodiff(1), repoquery(1), reposync(1), repo\-rss(1), yumdownloader(1), yum\-builddep(1), yum\-debug\-dump(1), yum\-groups\-manager(1), yumdb(8), yum\-complete\-transaction(8)
+debuginfo\-install(1), package\-cleanup(1), repodiff(1), repoquery(1), reposync(1), repo\-rss(1), show\-changed\-rco(1), show\-installed(1), yumdownloader(1), yum\-builddep(1), yum\-debug\-dump(1), yum\-groups\-manager(1), yumdb(8), yum\-complete\-transaction(8)
 .SH "AUTHOR"
 Shawn Starr <shawn.starr at rogers.com>