[yum-utils] Update to latest HEAD
Zdeněk Pavlas
zpavlas at fedoraproject.org
Thu Jul 25 09:17:51 UTC 2013
commit 59f88ca09285012dedfd08d6f87ada0095800831
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date: Thu Jul 25 11:17:39 2013 +0200
Update to latest HEAD
- Fix pacakge => package typos
- docs: Add missing man page short descriptions
- docs: Escape dashes in command-line options
- docs: Add missing man pages for all yum-utils
- Add --show-duplicates to repoquery manpage. BZ 975565
- yum-complete-transaction: unlock yum.pid. BZ 984119
- sanitize repoquery --repofrompath. BZ 988140
- yum changelog: implicit since=all. BZ 961782
- repoquery: retry doLock() BZ 988223
yum-utils-HEAD.patch | 1214 +++++++++++++++++++++++++++++++++++++++++++++-----
yum-utils.spec | 14 +-
2 files changed, 1124 insertions(+), 104 deletions(-)
---
diff --git a/yum-utils-HEAD.patch b/yum-utils-HEAD.patch
index e8cee66..2015378 100644
--- a/yum-utils-HEAD.patch
+++ b/yum-utils-HEAD.patch
@@ -126,8 +126,21 @@ index e77696a..d159169 100644
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
+diff --git a/ChangeLog b/ChangeLog
+index bc802f6..e9be2e4 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -3370,7 +3370,7 @@
+ 2008-08-04 James Antill <james at and.org>
+
+ * yum-builddep.py: Allow yum-builddep to use "extras"
+- (installed/not-available pacakges
++ (installed/not-available packages
+
+ 2008-08-04 James Antill <james at and.org>
+
diff --git a/debuginfo-install.py b/debuginfo-install.py
-index 177c6c3..be2ff2d 100755
+index 177c6c3..0f026f1 100755
--- a/debuginfo-install.py
+++ b/debuginfo-install.py
@@ -7,11 +7,11 @@
@@ -175,28 +188,144 @@ index 177c6c3..be2ff2d 100755
self.logger.critical('Could not find debuginfo pkg for dependency package %s' % deppo)
+
+ for pkgname in u:
-+ self.logger.critical('Could not find a pacakge for: %s' % pkgname)
++ self.logger.critical('Could not find a package for: %s' % pkgname)
+
# This is kinda hacky, accessing the option from the plugins code
# but I'm not sure of a better way of doing it
if not self.no_debuginfo_plugin and self.tsInfo:
diff --git a/docs/Makefile b/docs/Makefile
-index d01c1e4..13ea4e7 100644
+index d01c1e4..acb8559 100644
--- a/docs/Makefile
+++ b/docs/Makefile
-@@ -1,7 +1,7 @@
+@@ -1,7 +1,9 @@
DOCS = repoquery package-cleanup repo-rss yumdownloader yum-builddep yum-changelog reposync \
yum-list-data yum-filter-data yum-verify yum-utils yum-aliases yum-debug-dump yum-versionlock \
yum-groups-manager debuginfo-install repodiff yum-fs-snapshot \
- show-installed show-changed-rco
-+ show-installed show-changed-rco yum-debug-restore
++ show-installed show-changed-rco yum-debug-restore \
++ find-repos-of-install needs-restarting repo-graph repoclosure \
++ repomanage repotrack verifytree yum-config-manager
DOCS5 = yum-changelog.conf yum-versionlock.conf yum-fs-snapshot.conf
DOCS8 = yum-security yum-complete-transaction yumdb
+diff --git a/docs/debuginfo-install.1 b/docs/debuginfo-install.1
+index a47e28a..a829869 100644
+--- a/docs/debuginfo-install.1
++++ b/docs/debuginfo-install.1
+@@ -1,7 +1,7 @@
+ .\" debuginfo-install
+ .TH "debuginfo-install" "1" "21 October 2008" "James Antill" ""
+ .SH "NAME"
+-debuginfo-install
++debuginfo-install \- install debuginfo packages and their dependencies
+ .SH "SYNOPSIS"
+ \fBdebuginfo-install\fP package
+ .SH "DESCRIPTION"
+diff --git a/docs/find-repos-of-install.1 b/docs/find-repos-of-install.1
+new file mode 100644
+index 0000000..77be909
+--- /dev/null
++++ b/docs/find-repos-of-install.1
+@@ -0,0 +1,51 @@
++.\" find-repos-of-install
++.TH "find-repos-of-install" "1" "13 January 2013" "" ""
++.SH "NAME"
++find-repos-of-install \- report which Yum repository a package was installed from
++.SH "SYNOPSIS"
++\fBfind-repos-of-install\fP [options] package1 [package2...]
++.SH "DESCRIPTION"
++.PP
++\fBfind-repos-of-install\fP is a program which reports the Yum repository that
++a specified package was installed from.
++.PP
++.SH "OPTIONS"
++.IP "\fB\-\-version\fP"
++Report program version and exit.
++.IP "\fB\-h, \-\-help\fP"
++Display a help message, and then quit.
++.IP "\fB\-\-repoid=REPOID\fP"
++Specify repo ids to query, can be specified multiple times (default is
++all enabled).
++.IP "\fB\-\-enablerepo=ENABLEREPOS\fP"
++In addition to the default set, query the given additional repository, even if
++it is disabled in YUM configuration. Can be used multiple times.
++.IP "\fB\-\-disablerepo=DISABLEREPOS\fP"
++Do not query the given repository, even if it is enabled in YUM
++configuration. Can be used multiple times.
++.IP "\fB\-\-repofrompath=REPOID,PATH/URL\fP"
++Specify a path or url to a repository (same path as in a baseurl) to add to
++the repositories for this query. This option can be used multiple times. If
++you want to view only the pkgs from this repository combine this with
++\-\-repoid. The repoid for the repository is specified by REPOID.
++.IP "\fB\-C, \-\-cache\fP"
++Tells repoquery to run entirely from YUM cache - does not download any metadata
++or update the cache. Queries in this mode can fail or give partial/incorrect
++results if the cache isn't fully populated beforehand with eg "yum makecache".
++.IP "\fB\-\-tempcache\fP"
++Use a temp dir for storing/accessing yum-cache.
++.IP "\fB\-\-sync2yumdb\fP"
++Sync anything that is found to the yumdb, if available.
++
++.PP
++.SH "SEE ALSO"
++.nf
++.I yum.conf (5)
++http://yum.baseurl.org/
++.fi
++
++.PP
++.SH AUTHORS
++.nf
++See the Authors file included with this program.
++.fi
+diff --git a/docs/needs-restarting.1 b/docs/needs-restarting.1
+new file mode 100644
+index 0000000..74b1904
+--- /dev/null
++++ b/docs/needs-restarting.1
+@@ -0,0 +1,29 @@
++.\" needs-restarting
++.TH "needs-restarting" "1" "13 January 2013" "" ""
++.SH "NAME"
++needs-restarting \- report running processes that have been updated
++.SH "SYNOPSIS"
++\fBneeds-restarting\fP [options]
++.SH "DESCRIPTION"
++.PP
++\fBneeds-restarting\fP is a program that reports a list of process ids that
++started running before they or some component that they use were updated.
++.PP
++.SH "OPTIONS"
++.IP "\fB\-h, \-\-help\fP"
++Display a help message, and then quit.
++.IP "\fB\-u, \-\-useronly\fP"
++Show processes for my userid only.
++
++.PP
++.SH "SEE ALSO"
++.nf
++.I yum.conf (5)
++http://yum.baseurl.org/
++.fi
++
++.PP
++.SH "AUTHORS"
++.nf
++See the Authors file included with this program.
++.fi
diff --git a/docs/package-cleanup.1 b/docs/package-cleanup.1
-index 867cf4d..0405e09 100644
+index 867cf4d..61959ac 100644
--- a/docs/package-cleanup.1
+++ b/docs/package-cleanup.1
+@@ -1,7 +1,7 @@
+ .\" package-cleanup
+ .TH "package-cleanup" "1" "03 November 2005" "Gijs Hollestelle" ""
+ .SH "NAME"
+-package-cleanup
++package-cleanup \- clean up locally installed, duplicate, or orphaned packages
+ .SH "SYNOPSIS"
+ \fBpackage-cleanup\fP [options] <item ...>
+ .SH "DESCRIPTION"
@@ -14,7 +14,7 @@ Use alternative config file (default is /etc/yum.conf).
.IP "\fB\-h, \-\-help\fP"
Help; display a help message and then quit\&.
@@ -215,7 +344,7 @@ index 867cf4d..0405e09 100644
.PP
.SH "LEAVES OPTIONS"
.IP "\fB\-\-all\fP"
-@@ -49,8 +51,6 @@ When listing leaf nodes do not list development packages.
+@@ -49,21 +51,19 @@ When listing leaf nodes do not list development packages.
When listing leaf nodes do not list packages with files in bin directories.
.PP
.SH "OLDKERNELS OPTIONS"
@@ -224,31 +353,188 @@ index 867cf4d..0405e09 100644
.IP "\fB\-\-keepdevel\fP"
Do not remove kernel-devel packages when removing kernels
+ .SH "EXAMPLES"
+ .IP "List all dependency problems:"
+-\fBpackage-cleanup --problems\fP
++\fBpackage-cleanup \-\-problems\fP
+ .IP "List all packages that are not in any Yum repository:"
+-\fBpackage-cleanup --orphans\fP
++\fBpackage-cleanup \-\-orphans\fP
+ .IP "Remove old kernels keeping 3 and leaving old kernel-devel packages installed:"
+-\fBpackage-cleanup --oldkernels --count=3 --keepdevel\fP
++\fBpackage-cleanup \-\-oldkernels \-\-count=3 \-\-keepdevel\fP
+ .PP
+ .IP "List all leaf packages with no files in a bin directory whose name begins with either 'perl' or 'python':"
+-\fBpackage-cleanup --leaves --exclude-bin --leaf-regex="^(perl)|(python)"\fP
++\fBpackage-cleanup \-\-leaves \-\-exclude\-bin \-\-leaf\-regex="^(perl)|(python)"\fP
+ .PP
+ .SH "FILES"
+ As package-cleanup uses YUM libraries for retrieving all the information, it
+diff --git a/docs/repo-graph.1 b/docs/repo-graph.1
+new file mode 100644
+index 0000000..9bdbb20
+--- /dev/null
++++ b/docs/repo-graph.1
+@@ -0,0 +1,32 @@
++.\" repo-graph
++.TH "repo-graph" "1" "13 January 2013" "" ""
++.SH "NAME"
++repo-graph \- output a full package dependency graph in dot format
++.SH "SYNOPSIS"
++\fBrepo-graph\fP [options]
++.SH "DESCRIPTION"
++.PP
++\fBrepo-graph\fP is a program that generates a full package dependency list
++from a yum repository and outputs it in dot format.
++.PP
++.SH "OPTIONS"
++.IP "\fB\-h, \-\-help\fP"
++Display a help message, and then quit.
++.IP "\fB\-\-repoid=REPOID\fP"
++Specify repo ids to query, can be specified multiple times (default is
++all enabled).
++.IP "\fB\-c CONFIG\fP"
++Config file to use (defaults to /etc/yum.conf).
++
++.PP
++.SH "SEE ALSO"
++.nf
++.I yum.conf (5)
++http://yum.baseurl.org/
++.fi
++
++.PP
++.SH "AUTHORS"
++.nf
++See the Authors file included with this program.
++.fi
+diff --git a/docs/repo-rss.1 b/docs/repo-rss.1
+index 90788b8..62e00cc 100644
+--- a/docs/repo-rss.1
++++ b/docs/repo-rss.1
+@@ -1,7 +1,7 @@
+ .\" repo-rss
+ .TH "repo-rss" "1" "2005" "Seth Vidal" ""
+ .SH "NAME"
+-repo-rss
++repo-rss \- generates an RSS feed from one or more Yum repositories
+ .SH "SYNOPSIS"
+ \fBrepo-rss\fP [options] repoid1 [repoid2...]
+ .SH "DESCRIPTION"
+@@ -28,7 +28,7 @@ default for non-root users.
+
+ .SH "EXAMPLES"
+ .IP "Generate an RSS for the updates-released repository and save it as updates-release.xml:"
+-\fBrepo-rss -f updates-released.xml updates-released\fP
++\fBrepo-rss \-f updates-released.xml updates-released\fP
+ .PP
+ .SH "FILES"
+ As repo-rss uses YUM libraries for retrieving all the information, it
+diff --git a/docs/repoclosure.1 b/docs/repoclosure.1
+new file mode 100644
+index 0000000..e0f7091
+--- /dev/null
++++ b/docs/repoclosure.1
+@@ -0,0 +1,57 @@
++.\" repoclosure
++.TH "repoclosure" "1" "13 January 2013" "" ""
++.SH "NAME"
++repoclosure \- display a list of unresolved dependencies for a yum repository
++.SH "SYNOPSIS"
++\fBrepoclosure\fP [options]
++.SH "DESCRIPTION"
++.PP
++\fBrepoclosure\fP is a program that reads package metadata from one or more yum
++repositories, checks all dependencies, and displays a list of packages with
++unresolved dependencies.
++.PP
++.SH "OPTIONS"
++.IP "\fB\-h, \-\-help\fP"
++Display a help message, and then quit.
++.IP "\fB\-c CONFIG, \-\-config=CONFIG\fP"
++Config file to use (defaults to /etc/yum.conf).
++.IP "\fB\-a ARCH, \-\-arch=ARCH\fP"
++Check packages of the given archs, can be specified multiple times (default:
++current arch).
++.IP "\fB\-\-basearch=BASEARCH\fP"
++Set the basearch for yum to run as.
++.IP "\fB\-b, \-\-builddeps\fP"
++Check build dependencies only (needs source repos enabled).
++.IP "\fB\-l LOOKASIDE, \-\-lookaside=LOOKASIDE\fP"
++Specify a lookaside repo id to query, can be specified multiple times.
++.IP "\fB\-r REPOID, \-\-repoid=REPOID\fP"
++Specify repo ids to query, can be specified multiple times (default is
++all enabled).
++.IP "\fB\-t, \-\-tempcache\fP"
++Use a temp dir for storing/accessing yum-cache.
++.IP "\fB\-q, \-\-quiet\fP"
++Run quietly: no warnings printed to stderr.
++.IP "\fB\-n, \-\-newest\fP"
++Check only the newest packages in the repos.
++.IP "\fB\-\-repofrompath=REPOID,PATH/URL\fP"
++Specify a path or url to a repository (same path as in a baseurl) to add to
++the repositories for this query. This option can be used multiple times. If
++you want to view only the pkgs from this repository combine this with
++\-\-repoid. The repoid for the repository is specified by REPOID.
++.IP "\fB\-p PKG, \-\-pkg=PKG\fP"
++Check closure for this package only
++.IP "\fB\-g GROUP, \-\-group=GROUP\fP"
++Check closure for packages in this group only
++
++.PP
++.SH "SEE ALSO"
++.nf
++.I yum.conf (5)
++http://yum.baseurl.org/
++.fi
++
++.PP
++.SH "AUTHORS"
++.nf
++See the Authors file included with this program.
++.fi
diff --git a/docs/repodiff.1 b/docs/repodiff.1
-index c421c5d..ef2a373 100644
+index c421c5d..75a8860 100644
--- a/docs/repodiff.1
+++ b/docs/repodiff.1
-@@ -11,9 +11,11 @@ repositories. \fBNote\fP that by default only source packages are compared.
+@@ -1,37 +1,45 @@
+ .\" repodiff
+ .TH "repodiff" "1" "21 October 2008" "James Antill" ""
+ .SH "NAME"
+-repodiff
++repodiff \- list differences between two or more Yum repositories
+ .SH "SYNOPSIS"
+-\fBrepodiff\fP --old=old_repo_baseurl --new=new_repo_baseurl
++\fBrepodiff\fP \-\-old=old_repo_baseurl \-\-new=new_repo_baseurl
+ .SH "DESCRIPTION"
+ .PP
+ \fBrepodiff\fP is a program which will list differences between two sets of
+ repositories. \fBNote\fP that by default only source packages are compared.
.PP
.SH "GENERAL OPTIONS"
- .IP "\fB\-\-old, -o\fP"
+-.IP "\fB\-\-old, -o\fP"
-Add a repo. as an old repo.
+-.IP "\fB\-\-new, -n\fP"
+-Add a repo. as an new repo.
+-.IP "\fB\-\-archlist, -a\fP"
++.IP "\fB\-\-old, \-o\fP"
+Add a repo. as an old repo. Note that if you prefix the url with "mirror:" then
+the following url is treated as a mirror and not a baseurl.
- .IP "\fB\-\-new, -n\fP"
--Add a repo. as an new repo.
++.IP "\fB\-\-new, \-n\fP"
+Add a repo. as an new repo. Note that if you prefix the url with "mirror:" then
+the following url is treated as a mirror and not a baseurl.
- .IP "\fB\-\-archlist, -a\fP"
++.IP "\fB\-\-archlist, \-a\fP"
Add architectures to change the default from just comparing source packages.
Note that if you want the same as a native
-@@ -21,10 +23,14 @@ Note that if you want the same as a native
+ "x86_64" architecture machine you just need to pass "x86_64" (this is different
from earlier versions where you needed to specify
"x86_64,athlon,i686,i586,i486,i386,noarch" and you still got "src").
- .IP "\fB\-\-size, -s\fP"
+-.IP "\fB\-\-size, -s\fP"
-Ouput additional data about the size of the changes.
+-.IP "\fB\-\-compare-arch\fP"
++.IP "\fB\-\-size, \-s\fP"
+Output additional data about the size of the changes.
- .IP "\fB\-\-compare-arch\fP"
++.IP "\fB\-\-compare\-arch\fP"
Normally packages are just compared based on their name, this flag makes the
comparison also use the arch. So foo.i386 and foo.x86_64 are different.
+.IP "\fB\-\-simple\fP"
@@ -257,43 +543,222 @@ index c421c5d..ef2a373 100644
+Split the data for modified packages between upgraded and downgraded packages.
.SH "EXAMPLES"
.IP "Compare source pkgs in two local repos:"
- \fBrepodiff --old=/tmp/repo-old --new=/tmp/repo-new\fP
-@@ -32,6 +38,8 @@ comparison also use the arch. So foo.i386 and foo.x86_64 are different.
- \fBrepodiff -a x86_64 --old=http://example.com/repo1-old --old=/tmp/repo-old --new=http://example.com/repo1-new --new=/tmp/repo-new\fP
+-\fBrepodiff --old=/tmp/repo-old --new=/tmp/repo-new\fP
++\fBrepodiff \-\-old=/tmp/repo-old \-\-new=/tmp/repo-new\fP
+ .IP "Compare x86_64 compat. binary pkgs in two remote repos, and two local one:"
+-\fBrepodiff -a x86_64 --old=http://example.com/repo1-old --old=/tmp/repo-old --new=http://example.com/repo1-new --new=/tmp/repo-new\fP
++\fBrepodiff \-a x86_64 \-\-old=http://example.com/repo1-old \-\-old=/tmp/repo-old \-\-new=http://example.com/repo1-new \-\-new=/tmp/repo-new\fP
.IP "Compare x86_64 compat. binary pkgs, but also compare arch:"
- \fBrepodiff -a x86_64 --compare-arch --old=http://example.com/repo1-old --old=/tmp/repo-old --new=http://example.com/repo1-new --new=/tmp/repo-new\fP
+-\fBrepodiff -a x86_64 --compare-arch --old=http://example.com/repo1-old --old=/tmp/repo-old --new=http://example.com/repo1-new --new=/tmp/repo-new\fP
++\fBrepodiff \-a x86_64 \-\-compare\-arch \-\-old=http://example.com/repo1-old \-\-old=/tmp/repo-old \-\-new=http://example.com/repo1-new \-\-new=/tmp/repo-new\fP
+.IP "Compare two releases of Fedora (15 => 16):"
-+\fBrepodiff --old='mirror:https://mirrors.fedoraproject.org/metalink?repo=fedora-source-15&arch=i386' --new='mirror:https://mirrors.fedoraproject.org/metalink?repo=fedora-source-16&arch=i386' --size --simple --downgrade\fP
++\fBrepodiff \-\-old='mirror:https://mirrors.fedoraproject.org/metalink?repo=fedora-source-15&arch=i386' \-\-new='mirror:https://mirrors.fedoraproject.org/metalink?repo=fedora-source-16&arch=i386' \-\-size \-\-simple \-\-downgrade\fP
.PP
.SH "SEE ALSO"
+diff --git a/docs/repomanage.1 b/docs/repomanage.1
+new file mode 100644
+index 0000000..4d336a5
+--- /dev/null
++++ b/docs/repomanage.1
+@@ -0,0 +1,38 @@
++.\" repomanage
++.TH "repomanage" "1" "13 January 2013" "" ""
++.SH "NAME"
++repomanage \- list the newest or oldest RPM packages in a directory
++.SH "SYNOPSIS"
++\fBrepomanage\fP [options] directory
++.SH "DESCRIPTION"
++.PP
++\fBrepomanage\fP is a program to manage a directory of RPM packages. It
++displays a list of the newest or oldest packages in a directory for easy
++piping to xargs or similar programs.
++.PP
++.SH "OPTIONS"
++.IP "\fB\-h, \-\-help\fP"
++Display a help message, and then quit.
++.IP "\fB\-o, \-\-old\fP"
++Print the oldest packages.
++.IP "\fB\-n, \-\-new\fP"
++Print the newest packages.
++.IP "\fB\-s, \-\-space\fP"
++Space-separated instead of newline-separated output.
++.IP "\fB\-k KEEP, \-\-keep=KEEP\fP"
++Newest N packages to keep - defaults to 1.
++.IP "\fB\-c, \-\-nocheck\fP"
++Do not check package payload signatures/digests.
++
++.PP
++.SH "SEE ALSO"
++.nf
++.I yum.conf (5)
++http://yum.baseurl.org/
++.fi
++
++.PP
++.SH "AUTHORS"
++.nf
++See the Authors file included with this program.
++.fi
diff --git a/docs/repoquery.1 b/docs/repoquery.1
-index f5a8c5d..fe842f5 100644
+index f5a8c5d..81601ac 100644
--- a/docs/repoquery.1
+++ b/docs/repoquery.1
-@@ -130,7 +130,8 @@ package names). This is the default.
- When used with --whatrequires, search for dependencies only exactly as given.
- This is effectively the opposite of --alldeps.
+@@ -1,11 +1,11 @@
+ .\" repoquery
+ .TH "repoquery" "1" "17 October 2005" "Panu Matilainen" ""
+ .SH "NAME"
+-repoquery
++repoquery \- query information from Yum repositories
+ .SH "SYNOPSIS"
+ \fBrepoquery\fP [options] <item ...>
+ .br
+-\fBrepoquery\fP -a [options]
++\fBrepoquery\fP \-a [options]
+ .SH "DESCRIPTION"
+ .PP
+ \fBrepoquery\fP is a program for querying information from YUM repositories
+@@ -18,7 +18,7 @@ List valid queryformat tags and exit..
+ Report program version and exit.
+ .IP "\fB\-\-repoid=<repo>\fP"
+ Specify which repository to query. Using this option disables all repositories
+-not explicitly enabled with --repoid option (can be used multiple times). By
++not explicitly enabled with \-\-repoid option (can be used multiple times). By
+ default repoquery uses whatever repositories are enabled in YUM configuration.
+ .IP "\fB\-\-enablerepo=<repo>\fP"
+ In addition to the default set, query the given additional repository, even if
+@@ -30,7 +30,7 @@ configuration. Can be used multiple times.
+ Specify a path or url to a repository (same path as in a baseurl) to add to
+ the repositories for this query. This option can be used multiple times. If
+ you want to view only the pkgs from this repository combine this with
+---repoid. The repoid for the repository is specified by <repoid>.
++\-\-repoid. The repoid for the repository is specified by <repoid>.
+ .IP "\fB\-\-plugins\fP"
+ Enable YUM plugin support.
+ .IP "\fB\-q, \-\-query\fP"
+@@ -64,13 +64,13 @@ config just use: \-\-setopt=option=value for repo options use: \-\-setopt=repoid
+ .PP
+ .SH "PACKAGE QUERY OPTIONS"
+ .IP "\fB\-i, \-\-info\fP"
+-Show general information about package similarly to "rpm -qi"
++Show general information about package similarly to "rpm \-qi"
+ .IP "\fB\-l, \-\-list\fP"
+ List files in package.
+ .IP "\fB\-R, \-\-requires\fP"
+ List package dependencies.
+ .IP "\fB\-\-resolve\fP"
+-When used with --requires, resolve capabilities to originating packages.
++When used with \-\-requires, resolve capabilities to originating packages.
+ .IP "\fB\-\-provides\fP"
+ List capabilities package provides.
+ .IP "\fB\-\-obsoletes\fP"
+@@ -81,7 +81,7 @@ List capabilities conflicting with package.
+ List package changelog.
+ .IP "\fB\-\-location\fP"
+ Show a location where the package could be downloaded from.
+-For example: \fBwget `repoquery --location yum`\fP
++For example: \fBwget `repoquery \-\-location yum`\fP
+ .IP "\fB\-s, \-\-source\fP"
+ Show package source RPM name.
+ .IP "\fB\-\-srpm\fP"
+@@ -95,16 +95,16 @@ Use name-epoch:version-release.architecture output format (default)
+ .IP "\fB\-\-envra\fP"
+ Use epoch:name-version-release.architecture output format
+ (easier to parse than nevra)
+-.IP "\fB\--qf=FORMAT, \-\-queryformat=FORMAT\fP"
++.IP "\fB\-\-qf=FORMAT, \-\-queryformat=FORMAT\fP"
+ Specify custom output format for queries. You can add ":date", ":day" and
+ ":isodate" to all the tags that are a time, and you can add ":k", ":m", ":g",
+ ":t" and ":h" to sizes. You can also specify field width as in
+ sprintf (Eg. %-20{name})
+ .IP "\fB\-\-output [text|ascii-tree|dot-tree]\fP"
+-Output format which can be used with --requires/--whatrequires/--obsoletes/--conflicts.
++Output format which can be used with \-\-requires/\-\-whatrequires/\-\-obsoletes/\-\-conflicts.
+ Default output is 'text'.
+ .IP "\fB\-\-level [all|any int]\fP"
+-In combination with --output ascii-tree|dot-tree this option specifies the
++In combination with \-\-output ascii-tree|dot-tree this option specifies the
+ number of level to print on the tree. Default level is 'all'.
+ .PP
+
+@@ -112,6 +112,8 @@ number of level to print on the tree. Default level is 'all'.
+ .IP "\fB\-a, \-\-all\fP"
+ Query all available packages (for rpmquery compatibility / shorthand for
+ repoquery '*')
++.IP "\fB\--show-duplicates\fP"
++Query all versions of packages.
+ .IP "\fB\-f, \-\-file FILE\fP"
+ Query package owning FILE.
+ .IP "\fB\-\-whatobsoletes CAPABILITY\fP"
+@@ -123,14 +125,15 @@ Query all packages that provide CAPABILITY.
+ .IP "\fB\-\-whatrequires CAPABILITY\fP"
+ Query all packages that require CAPABILITY.
+ .IP "\fB\-\-alldeps\fP"
+-When used with --whatrequires, look for non-explicit dependencies in
++When used with \-\-whatrequires, look for non-explicit dependencies in
+ addition to explicit ones (e.g. files and Provides in addition to
+ package names). This is the default.
+ .IP "\fB\-\-exactdeps\fP"
+-When used with --whatrequires, search for dependencies only exactly as given.
+-This is effectively the opposite of --alldeps.
++When used with \-\-whatrequires, search for dependencies only exactly as given.
++This is effectively the opposite of \-\-alldeps.
.IP "\fB\-\-recursive\fP"
-When used with --whatrequires, query packages recursively.
-+When used with --whatrequires, and --requires --resolve, query packages
++When used with \-\-whatrequires, and \-\-requires \-\-resolve, query packages
+recursively.
.IP "\fB\-\-archlist=ARCH1[,ARCH2...]\fP"
Limit the query to packages of given architecture(s). Valid values are all
architectures known to rpm/yum such as 'i386' and 'src' for
-@@ -166,7 +167,7 @@ Query groups instead of packages.
+@@ -166,19 +169,19 @@ Query groups instead of packages.
.SH "EXAMPLES"
.IP "List all packages whose name contains 'perl':"
-\fBrepoquery '*perl*'\fP
+\fBrepoquery \(aq*perl*\(aq\fP
.IP "List all packages depending on openssl:"
- \fBrepoquery --whatrequires openssl\fP
+-\fBrepoquery --whatrequires openssl\fP
++\fBrepoquery \-\-whatrequires openssl\fP
.IP "List all package names and the repository they come from, nicely formatted:"
+-\fBrepoquery -a --qf "%-20{repoid} %{name}"\fP
++\fBrepoquery \-a \-\-qf "%-20{repoid} %{name}"\fP
+ .IP "List name and summary of all available updates (if any), nicely formatted:"
+-\fBrepoquery -a --pkgnarrow=updates --qf "%{name}:\\n%{summary}\\n"\fP
++\fBrepoquery \-a \-\-pkgnarrow=updates \-\-qf "%{name}:\\n%{summary}\\n"\fP
+ .IP "List optional packages in base group:"
+-\fBrepoquery -g --grouppkgs=optional -l base\fP
++\fBrepoquery \-g \-\-grouppkgs=optional \-l base\fP
+ .IP "List build requirements from 'anaconda' source rpm:"
+-\fBrepoquery --requires anaconda.src\fP
++\fBrepoquery \-\-requires anaconda.src\fP
+ .IP "List packages which BuildRequire gail-devel"
+-\fBrepoquery --archlist=src --whatrequires gail-devel\fP
++\fBrepoquery \-\-archlist=src \-\-whatrequires gail-devel\fP
+ NB: This command will only work if you have repositories enabled which include srpms.
+
+ .\"TODO: Add more examples...
+@@ -204,7 +207,7 @@ of the following:
+ .br
+ \fBepoch:name-ver-rel.arch\fP
+ .IP
+-For example: \fBrepoquery -l kernel-2.4.1-10.i686\fP
++For example: \fBrepoquery \-l kernel-2.4.1-10.i686\fP
+ .br
+ Additionally wildcards (shell-style globs) can be used.
+
diff --git a/docs/reposync.1 b/docs/reposync.1
-index c1bc818..1e6c6c2 100644
+index c1bc818..29043fb 100644
--- a/docs/reposync.1
+++ b/docs/reposync.1
+@@ -1,7 +1,7 @@
+ .\" reposync
+ .TH "reposync" "1" "27 April 2007" "" ""
+ .SH "NAME"
+-reposync - synchronize yum repositories to a local directory
++reposync \- synchronize yum repositories to a local directory
+ .SH "SYNOPSIS"
+ \fBreposync\fP [options]
+ .SH "DESCRIPTION"
@@ -14,7 +14,7 @@ Display a help message, and then quit.
Config file to use (defaults to /etc/yum.conf).
.IP "\fB\-a ARCH, \-\-arch=ARCH\fP"
@@ -303,32 +768,106 @@ index c1bc818..1e6c6c2 100644
.IP "\fB\-\-source\fP"
Also download .src.rpm files.
.IP "\fB\-r REPOID, \-\-repoid=REPOID\fP"
-@@ -26,8 +26,11 @@ Use a temp dir for storing/accessing yum-cache.
+@@ -26,21 +26,26 @@ Use a temp dir for storing/accessing yum-cache.
Path to download packages to: defaults to current directory.
.IP "\fB\-g, \-\-gpgcheck\fP"
Remove packages that fail GPG signature checking after downloading.
+exit status is '1' if at least one package was removed.
.IP "\fB\-u, \-\-urls\fP"
Just list urls of what would be downloaded, don't download.
+-.IP "\fB\-n, \-\-newest-only\fP"
+.IP "\fB\-l, \-\-plugins\fP"
+Enable yum plugin support.
- .IP "\fB\-n, \-\-newest-only\fP"
++.IP "\fB\-n, \-\-newest\-only\fP"
Download only newest packages per-repo.
.IP "\fB\-q, \-\-quiet\fP"
-@@ -41,6 +44,8 @@ Output as little information as possible.
- \fB reposync --repoid=updates --repoid=extras\fP
+ Output as little information as possible.
+ .SH "EXAMPLES"
+ .IP "Sync all packages from the 'updates' repo to the current directory:"
+-\fB reposync --repoid=updates\fP
++\fB reposync \-\-repoid=updates\fP
+ .IP "Sync only the newest packages from the 'updates' repo to the current directory:"
+-\fB reposync -n --repoid=updates\fP
++\fB reposync \-n \-\-repoid=updates\fP
+ .IP "Sync packages from the 'updates' and 'extras' repos to the current directory:"
+-\fB reposync --repoid=updates --repoid=extras\fP
++\fB reposync \-\-repoid=updates \-\-repoid=extras\fP
.IP "Sync all packages from the 'updates' repo to the \fBrepos\fP directory:"
- \fB reposync -p repos --repoid=updates\fP
+-\fB reposync -p repos --repoid=updates\fP
++\fB reposync \-p repos \-\-repoid=updates\fP
+.IP "Sync all packages from the 'updates' repo to the \fBrepos\fP directory excluding x86_64 arch. Edit \fI/etc/yum.conf\fR adding option \fBexclude=*.x86_64\fR. Then:
-+\fBreposync -p repos --repoid=updates\fP
++\fBreposync \-p repos \-\-repoid=updates\fP
.SH "FILES"
\fBreposync\fP uses the yum libraries for retrieving information and
packages. If no configuration file is specified, the default yum
+diff --git a/docs/repotrack.1 b/docs/repotrack.1
+new file mode 100644
+index 0000000..6b46ed0
+--- /dev/null
++++ b/docs/repotrack.1
+@@ -0,0 +1,44 @@
++.\" repotrack
++.TH "repotrack" "1" "13 January 2013" "" ""
++.SH "NAME"
++repotrack \- track a package and its dependencies and download them
++.SH "SYNOPSIS"
++\fBrepotrack\fP [options] package1 [package2...]
++.SH "DESCRIPTION"
++.PP
++\fBrepotrack\fP is a program for keeping track of a particular package and its
++dependencies. It will download one or more packages and all dependencies.
++.PP
++.SH "OPTIONS"
++.IP "\fB\-h, \-\-help\fP"
++Display a help message, and then quit.
++.IP "\fB\-c CONFIG, \-\-config=CONFIG\fP"
++Config file to use (defaults to /etc/yum.conf).
++.IP "\fB\-a ARCH, \-\-arch=ARCH\fP"
++Act as if running the specified arch (default: current arch).
++.IP "\fB\-r REPOID, \-\-repoid=REPOID\fP"
++Specify repo ids to query, can be specified multiple times (default is
++all enabled).
++.IP "\fB\-t, \-\-tempcache\fP"
++Use a temp dir for storing/accessing yum-cache.
++.IP "\fB\-p DESTDIR, \-\-download_path=DESTDIR\fP"
++Path to download packages to.
++.IP "\fB\-u, \-\-urls\fP"
++Instead of downloading RPMs, list the URLs that would be downloaded.
++.IP "\fB\-n, \-\-newest\fP"
++Toggle downloading only the newest packages (defaults to newest-only).
++.IP "\fB\-q, \-\-quiet\fP"
++Output as little information as possible.
++
++.PP
++.SH "SEE ALSO"
++.nf
++.I yum.conf (5)
++http://yum.baseurl.org/
++.fi
++
++.PP
++.SH "AUTHORS"
++.nf
++See the Authors file included with this program.
++.fi
diff --git a/docs/show-changed-rco.1 b/docs/show-changed-rco.1
-index 3e3b62c..1b0ea65 100644
+index 3e3b62c..a88c942 100644
--- a/docs/show-changed-rco.1
+++ b/docs/show-changed-rco.1
-@@ -11,7 +11,7 @@ packages Requires, Conflicts and Obsoletes data from the installed (or old) to
+@@ -1,17 +1,17 @@
+ .\" show-changed-rco
+ .TH "show-installed" "1" "30 March 2011" "James Antill" ""
+ .SH "NAME"
+-show\-changed-\-rco
++show\-changed\-rco \- show changes in an RPM package
+ .SH "SYNOPSIS"
+-\fBshow\-changed-\-rco\fP [options]
++\fBshow\-changed\-rco\fP [options]
+ .SH "DESCRIPTION"
+ .PP
+-\fBshow\-changed-\-rco\fP gives a compact description of the changes to a
++\fBshow\-changed\-rco\fP gives a compact description of the changes to a
+ packages Requires, Conflicts and Obsoletes data from the installed (or old) to
a specified rpm file.
.SH OPTIONS
.TP
@@ -337,10 +876,46 @@ index 3e3b62c..1b0ea65 100644
show this help message and exit
.IP "\fB\-C, \-\-cache\fP"
Tells repoquery to run entirely from YUM cache - does not download any metadata
+@@ -22,7 +22,7 @@ Use alternative config file (default is /etc/yum.conf).
+
+ .IP "\fB\-\-repoid=<repo>\fP"
+ Specify which repository to query. Using this option disables all repositories
+-not explicitly enabled with --repoid option (can be used multiple times). By
++not explicitly enabled with \-\-repoid option (can be used multiple times). By
+ default repoquery uses whatever repositories are enabled in YUM configuration.
+ .IP "\fB\-\-enablerepo=<repo>\fP"
+ In addition to the default set, query the given additional repository, even if
+@@ -34,13 +34,13 @@ configuration. Can be used multiple times.
+ Specify a path or url to a repository (same path as in a baseurl) to add to
+ the repositories for this query. This option can be used multiple times. If
+ you want to view only the pkgs from this repository combine this with
+---repoid. The repoid for the repository is specified by <repoid>.
++\-\-repoid. The repoid for the repository is specified by <repoid>.
+
+-.IP "\fB\-\-old-packages=<pkg>\fP"
++.IP "\fB\-\-old\-packages=<pkg>\fP"
+ Explicitly list the valid old packages to match the new packages against.
+-.IP "\fB\-\-ignore-arch\fP"
++.IP "\fB\-\-ignore\-arch\fP"
+ Ignore arch. so you can compare foo-2.i686 to foo-1.x86_64.
+-.IP "\fB\-\-skip-new\fP"
++.IP "\fB\-\-skip\-new\fP"
+ Only give output for packages which we've found an old package for.
+
+ .PP
diff --git a/docs/show-installed.1 b/docs/show-installed.1
-index 7072b63..18c4af8 100644
+index 7072b63..0907ea2 100644
--- a/docs/show-installed.1
+++ b/docs/show-installed.1
+@@ -1,7 +1,7 @@
+ .\" show-installed
+ .TH "show-installed" "1" "21 October 2010" "Florian Festi" ""
+ .SH "NAME"
+-show\-installed
++show\-installed \- show installed RPM packages and descriptions
+ .SH "SYNOPSIS"
+ \fBshow\-installed\fP [options]
+ .SH "DESCRIPTION"
@@ -16,10 +16,10 @@ show this help message and exit
yum, kickstart or human; yum gives the result as a yum command line; kickstart the content of a %packages section; "human" readable is default.
.TP
@@ -354,23 +929,203 @@ index 7072b63..18c4af8 100644
.TP
.B \-q, \-\-quiet
Do not show warnings.
+diff --git a/docs/verifytree.1 b/docs/verifytree.1
+new file mode 100644
+index 0000000..1389e0f
+--- /dev/null
++++ b/docs/verifytree.1
+@@ -0,0 +1,33 @@
++.\" verifytree
++.TH "verifytree" "1" "13 January 2013" "" ""
++.SH "NAME"
++verifytree \- verify that a local yum repository is consistent
++.SH "SYNOPSIS"
++\fBverifytree\fP [options] directory
++.SH "DESCRIPTION"
++.PP
++\fBverifytree\fP is a program that verifies whether a local yum repository is
++consistent.
++.PP
++.SH "OPTIONS"
++.IP "\fB\-h, \-\-help\fP"
++Display a help message, and then quit.
++.IP "\fB\-a, \-\-checkall\fP"
++Check all packages in the repository.
++.IP "\fB\-t TESTOPIA, \-\-testopia=TESTOPIA\fP"
++Report results to the given testopia run number.
++.IP "\fB\-r, \-\-treeinfo\fP"
++Check the checksums of listed files in a .treeinfo file, if available.
++
++.PP
++.SH "SEE ALSO"
++.nf
++.I yum.conf (5)
++http://yum.baseurl.org/
++.fi
++
++.PP
++.SH "AUTHORS"
++.nf
++See the Authors file included with this program.
++.fi
diff --git a/docs/yum-aliases.1 b/docs/yum-aliases.1
-index c0f148d..8b943d4 100644
+index c0f148d..62fae3e 100644
--- a/docs/yum-aliases.1
+++ b/docs/yum-aliases.1
-@@ -28,7 +28,7 @@ last form creates a new alias.
+@@ -26,9 +26,9 @@ last form creates a new alias.
+ .PP
+ .SH Explanation of alias to final result conversion
.PP
- When you type an aliased command, like "yum --disableexcludes UPT lsu" using
+-When you type an aliased command, like "yum --disableexcludes UPT lsu" using
++When you type an aliased command, like "yum \-\-disableexcludes UPT lsu" using
the default aliases, the yum-aliases plugin first takes the first "command", by
-skiping over any options, and then looks up the result (in this case "UPT" is converted to "--enablerepo=updates-tesintg"). If there is a match, then it will
-+skipping over any options, and then looks up the result (in this case "UPT" is converted to "--enablerepo=updates-testing"). If there is a match, then it will
++skipping over any options, and then looks up the result (in this case "UPT" is converted to "\-\-enablerepo=updates-testing"). If there is a match, then it will
replace the aliased "command" in the argument list and try again (again
skipping over any options). By convention, in the default aliases list, alias
"commands" that are in all CAPS only add options so you can join together a
+@@ -49,19 +49,19 @@ yum
+ .B alias
+ rm remove
+ .PP
+-To always add the --skip-broken --disableexcludes=all --obsoletes options to
++To always add the \-\-skip\-broken \-\-disableexcludes=all \-\-obsoletes options to
+ the update command (but leaving the upgrade option alone), you could use:
+ .IP
+ yum
+ .B alias
+-update \\update --skip-broken --disableexcludes=all --obsoletes
++update \\update \-\-skip\-broken \-\-disableexcludes=all \-\-obsoletes
+ .PP
+ To override the default "up" alias to use the above update command, and never
+ ask for confirmation, you could use:
+ .IP
+ yum
+ .B alias
+-up update -y
++up update \-y
+ .br
+
+
+diff --git a/docs/yum-builddep.1 b/docs/yum-builddep.1
+index 4e6c1d7..ac7601e 100644
+--- a/docs/yum-builddep.1
++++ b/docs/yum-builddep.1
+@@ -1,7 +1,7 @@
+ .\" yum-builddep
+ .TH "yum-builddep" "1" "17 July 2005 " "Panu Matilainen" ""
+ .SH "NAME"
+-yum-builddep
++yum-builddep \- install missing dependencies for building an RPM package
+ .SH "SYNOPSIS"
+ \fByum-builddep\fP package
+ .SH "DESCRIPTION"
+diff --git a/docs/yum-changelog.1 b/docs/yum-changelog.1
+index 64910dc..c7b5486 100644
+--- a/docs/yum-changelog.1
++++ b/docs/yum-changelog.1
+@@ -14,12 +14,12 @@ is a Yum plugin for viewing package changelogs before/after updating.
+ yum will invoke
+ .BR yum-changelog(1)
+ plugin if the
+-.B --changelog
++.B \-\-changelog
+ option or the
+ .B changelog
+ command is used with yum.
+ .SH OPTIONS
+-.IP --changelog
++.IP \-\-changelog
+ Show changelog delta of updated packages
+ .SH COMMANDS
+ .IP changelog
+@@ -53,7 +53,7 @@ changelog stats. 33 pkgs, 12 source pkgs, 1 changelog
+ .br
+ .br
+ # yum update ktechlab
+-.B --changelog
++.B \-\-changelog
+ .br
+ Loading "changelog" plugin
+ .br
+diff --git a/docs/yum-complete-transaction.8 b/docs/yum-complete-transaction.8
+index 945eee8..965c0b1 100644
+--- a/docs/yum-complete-transaction.8
++++ b/docs/yum-complete-transaction.8
+@@ -1,13 +1,13 @@
+ .\" yum-complete-transaction
+ .TH "yum-complete-transaction" "8" "10 December 2007" "Seth Vidal" ""
+ .SH "NAME"
+-yum-complete-transaction
++yum-complete-transaction \- attempt to complete failed or aborted Yum transactions
+ .SH "SYNOPSIS"
+ \fByum-complete-transaction\fP [options]
+ .SH "GENERAL OPTIONS"
+ .IP "\fB\-h, \-\-help\fP"
+ Help; display a help message and then quit\&.
+-.IP "\fB\-\-cleanup-only\fP"
++.IP "\fB\-\-cleanup\-only\fP"
+ Only clean up only transaction journal files and exit\&.
+
+ .SH "DESCRIPTION"
+diff --git a/docs/yum-config-manager.1 b/docs/yum-config-manager.1
+new file mode 100644
+index 0000000..81b895b
+--- /dev/null
++++ b/docs/yum-config-manager.1
+@@ -0,0 +1,39 @@
++.\" yum-config-manager
++.TH "yum-config-manager" "1" "13 January 2013" "" ""
++.SH "NAME"
++yum-config-manager \- manage yum configuration options and yum repositories
++.SH "SYNOPSIS"
++\fByum-config-manager\fP [options]
++.SH "DESCRIPTION"
++.PP
++\fByum-config-manager\fP is a program that can manage main yum configuration
++options, toggle which repositories are enabled or disabled, and add new
++repositories.
++.PP
++.SH "OPTIONS"
++.IP "\fB\-h, \-\-help\fP"
++Display a help message, and then quit.
++.IP "\fB\-\-save\fP"
++Save the current options (useful with \-\-setopt).
++.IP "\fB\-\-enable\fP"
++Enable the specified repos (automatically saves).
++.IP "\fB\-\-disable\fP"
++Disable the specified repos (automatically saves).
++.IP "\fB\-\-add\-repo=ADDREPO\fP"
++Add (and enable) the repo from the specified file or url.
++.SH "ADDITIONAL OPTIONS"
++Yum-config-manager inherits all other options from yum. See the yum(8)
++man page for more information.
++
++.PP
++.SH "SEE ALSO"
++.nf
++.I yum.conf (5)
++http://yum.baseurl.org/
++.fi
++
++.PP
++.SH "AUTHORS"
++.nf
++See the Authors file included with this program.
++.fi
diff --git a/docs/yum-debug-dump.1 b/docs/yum-debug-dump.1
-index 0e65a07..71e5f3f 100644
+index 0e65a07..3f1e2e5 100644
--- a/docs/yum-debug-dump.1
+++ b/docs/yum-debug-dump.1
+@@ -1,7 +1,7 @@
+ .\" yum-debug-dump
+ .TH "yum-debug-dump" "1" "28 April 2008" "Seth Vidal" ""
+ .SH "NAME"
+-yum-debug-dump
++yum-debug-dump \- write system RPM configuration to a debug-dump file
+ .SH "SYNOPSIS"
+ \fByum-debug-dump\fP
+ .SH "DESCRIPTION"
@@ -10,11 +10,15 @@ yum-debug-dump
lot of information useful to developers trying to debug a problem.
.PP
@@ -398,14 +1153,14 @@ index 0e65a07..71e5f3f 100644
.fi
diff --git a/docs/yum-debug-restore.1 b/docs/yum-debug-restore.1
new file mode 100644
-index 0000000..ba96a05
+index 0000000..c9d388d
--- /dev/null
+++ b/docs/yum-debug-restore.1
@@ -0,0 +1,62 @@
+.\" yum-debug-dump
+.TH "yum-debug-restore" "1" "15 December 2011" "James Antill" ""
+.SH "NAME"
-+yum-debug-restore
++yum-debug-restore \- replay Yum transactions captured in a debug-dump file
+.SH "SYNOPSIS"
+\fByum-debug-restore\fP
+.SH "DESCRIPTION"
@@ -420,13 +1175,13 @@ index 0000000..ba96a05
+Output the commands that would be run to stdout.
+.IP "\fB\-\-shell=<file>\fP"
+Output the commands that would be run to a file.
-+.IP "\fB\-\-install-latest\fP"
++.IP "\fB\-\-install\-latest\fP"
+Ask yum to install the latest version of the given packages, instead of the
+version that was installed in the debug-dump file.
-+.IP "\fB\-\-ignore-arch\fP"
++.IP "\fB\-\-ignore\-arch\fP"
+Ignore the architecture of the packages, so you can "restore" an i386 debug-dump
+on an x86_64 machine.
-+.IP "\fB\-\-filter-types=[install,remove,update,downgrade]\fP"
++.IP "\fB\-\-filter\-types=[install,remove,update,downgrade]\fP"
+Only perform the given types of commands, so you can filter to just upgrades
+and installs.
+
@@ -465,44 +1220,106 @@ index 0000000..ba96a05
+
+.fi
diff --git a/docs/yum-filter-data.1 b/docs/yum-filter-data.1
-index 6d7f1e4..b26f1fd 100644
+index 6d7f1e4..75a8236 100644
--- a/docs/yum-filter-data.1
+++ b/docs/yum-filter-data.1
-@@ -44,7 +44,7 @@ This option includes packages which have a committer which matches one of the
+@@ -16,52 +16,52 @@ is treated as a match.
+ These are the options added to yum that are available in the "list updates",
+ "info updates", "check-update" and "update" commands. They are:
+ .PP
+-.IP "\fB\--filter-vendors\fP"
++.IP "\fB\-\-filter\-vendors\fP"
+ This option includes packages which have a vendor which matches one of the
+ passed vendor wildcard strings, or is unknown. Note that vendors can have
+ spaces in their value, so "," is the only way to specify multiple vendors as one
+ option argument.
+-.IP "\fB\--filter-rpm-groups\fP"
++.IP "\fB\-\-filter\-rpm\-groups\fP"
+ This option includes packages which have a group which matches one of the
+ passed rpm group wildcard strings, or is unknown. Note that rpm groups can have
+ spaces in their value, so "," is the only way to specify multiple rpm groups as
+ one option argument.
+-.IP "\fB\--filter-packagers\fP"
++.IP "\fB\-\-filter\-packagers\fP"
+ This option includes packages which have a packager which matches one of the
+ passed packager wildcard strings, or is unknown. Note that vendors can have
+ spaces in their value, so "," is the only way to specify multiple packagers as
+ one option argument.
+-.IP "\fB\--filter-licenses\fP"
++.IP "\fB\-\-filter\-licenses\fP"
+ This option includes packages which have a license which matches one of the
+ passed license wildcard strings, or is unknown. Note that licenses can have
+ spaces in their value, so "," is the only way to specify multiple licenses as
+ one option argument.
+-.IP "\fB\--filter-arches\fP"
++.IP "\fB\-\-filter\-arches\fP"
+ This option includes packages which have a arch which matches one of the
+ passed arch wildcard strings, or is unknown.
+-.IP "\fB\--filter-committers\fP"
++.IP "\fB\-\-filter\-committers\fP"
+ This option includes packages which have a committer which matches one of the
passed committer wildcard strings, or is unknown. Note that committers can have
spaces in their value, so "," is the only way to specify multiple committers as
one option argument. Also, committer values are so loosely formed that they
-could contain commas too, it is recommeneded to not do that but you can work
+could contain commas too, it is recommended to not do that but you can work
around it by using "?".
- .IP "\fB\--filter-buildhosts\fP"
+-.IP "\fB\--filter-buildhosts\fP"
++.IP "\fB\-\-filter\-buildhosts\fP"
This option includes packages which have a buildhost which matches one of the
-@@ -77,23 +77,23 @@ yum --filter-package-sizes=-1m check-update
+ passed buildhost wildcard strings, or is unknown.
+-.IP "\fB\--filter-urls\fP"
++.IP "\fB\-\-filter\-urls\fP"
+ This option includes packages which have a url which matches one of the
+ passed url wildcard strings, or is unknown.
+-.IP "\fB\--filter-package-sizes\fP"
++.IP "\fB\-\-filter\-package\-sizes\fP"
+ This option includes packages which have a packagesize which is within one of
+ the passed packagesize ranges, or is unknown.
+-.IP "\fB\--filter-archive-sizes\fP"
++.IP "\fB\-\-filter\-archive\-sizes\fP"
+ This option includes packages which have a archivesize which is within one of
+ the passed archivesize ranges, or is unknown.
+-.IP "\fB\--filter-installed-sizes\fP"
++.IP "\fB\-\-filter\-installed\-sizes\fP"
+ This option includes packages which have a installedsize which is within one of
+ the passed installedsize ranges, or is unknown.
+-.IP "\fB\--filter-groups\fP"
++.IP "\fB\-\-filter\-groups\fP"
+ This option includes packages which are in a yum group which matches one of the
+ passed yum group id strings, or is unknown. Note that yum groups can have
+ spaces in their value, so "," is the only way to specify multiple yum groups as
+@@ -73,27 +73,27 @@ one option argument.
+ .PP
+ To list all updates that are 1 MB or less use:
+ .IP
+-yum --filter-package-sizes=-1m check-update
++yum \-\-filter\-package\-sizes=-1m check-update
.PP
To apply updates that Dan Walsh has committed use:
.IP
-yum --filter-committers='Dan Walsh *' update
-+yum --filter-committers=\(aqDan Walsh *\(aq update
++yum \-\-filter\-committers=\(aqDan Walsh *\(aq update
.PP
To list updates for a specific group use:
.IP
-yum --filter-rpm-groups='App*/Sys*' list updates
-+yum --filter-rpm-groups=\(aqApp*/Sys*\(aq list updates
++yum \-\-filter\-rpm\-groups=\(aqApp*/Sys*\(aq list updates
.PP
To apply updates to a specific set of groups use:
.IP
-yum --filter-rpm-groups='App*/System,Devel*/Lib*,System Environment/Base' update
-+yum --filter-rpm-groups=\(aqApp*/System,Devel*/Lib*,System Environment/Base\(aq update
++yum \-\-filter\-rpm\-groups=\(aqApp*/System,Devel*/Lib*,System Environment/Base\(aq update
.PP
To list updates for a set of yum groups use:
.IP
-yum --filter-groups='PostgreSQL Database,Web Server' list updates
-+yum --filter-groups=\(aqPostgreSQL Database,Web Server\(aq list updates
++yum \-\-filter\-groups=\(aqPostgreSQL Database,Web Server\(aq list updates
.PP
To apply updates to a specific set of yum groups use:
.IP
-yum --filter-groups='KDE,Core,Printing Support' update
-+yum --filter-groups=\(aqKDE,Core,Printing Support\(aq update
++yum \-\-filter\-groups=\(aqKDE,Core,Printing Support\(aq update
.SH "SEE ALSO"
.nf
@@ -516,7 +1333,7 @@ index 6d7f1e4..b26f1fd 100644
Apart from that there are no bugs, but should you find any, you should first
consult the FAQ section on http://yum.baseurl.org/wiki/Faq and if unsuccessful
diff --git a/docs/yum-fs-snapshot.conf.5 b/docs/yum-fs-snapshot.conf.5
-index a4b4f02..4ac623a 100644
+index a4b4f02..68bb2e8 100644
--- a/docs/yum-fs-snapshot.conf.5
+++ b/docs/yum-fs-snapshot.conf.5
@@ -20,6 +20,10 @@ utilizes configuration options in the form of
@@ -530,21 +1347,29 @@ index a4b4f02..4ac623a 100644
.SH OPTION - [lvm] section
.IP enabled
This is a boolean value used to control whether LVM snapshots will be
-@@ -28,7 +32,8 @@ created for filesystems built on LVM logical volumes.
+@@ -27,8 +31,9 @@ created for filesystems built on LVM logical volumes.
+ .SH OPTION - [lvm] section
.IP lvcreate_size_args
This is the space delimited lvcreate argument list that is used to
- specify the size of the snapshot LV. Valid lvcreate size options are -l
+-specify the size of the snapshot LV. Valid lvcreate size options are -l
-or -L. If not specified then LVM snapshots will not be created.
-+or -L. If not specified then LVM snapshots will not be created for
++specify the size of the snapshot LV. Valid lvcreate size options are \-l
++or \-L. If not specified then LVM snapshots will not be created for
+volumes that are not thinly provisioned.
.SH AUTHOR
.RS
Josef Bacik <josef at toxicpanda.com>
diff --git a/docs/yum-groups-manager.1 b/docs/yum-groups-manager.1
-index f49bde9..c256c45 100644
+index f49bde9..9854884 100644
--- a/docs/yum-groups-manager.1
+++ b/docs/yum-groups-manager.1
-@@ -6,7 +6,7 @@ yum-groups-manager - create and edit yum's group metadata
+@@ -1,12 +1,12 @@
+ .\" yum-groups-manager
+ .TH "yum-groups-manager" "1" "23 August 2008" "" ""
+ .SH "NAME"
+-yum-groups-manager - create and edit yum's group metadata
++yum-groups-manager \- create and edit yum's group metadata
+ .SH "SYNOPSIS"
\fByum-groups-manager\fP [options] [packages]
.SH "DESCRIPTION"
\fByum-groups-manager\fP is used to create or edit a group metadata file for a
@@ -567,12 +1392,13 @@ index f49bde9..c256c45 100644
.SH "EXAMPLES"
.IP "Create a new group metadata file, with a group called yum containing all the packages that start with yum:"
-\fB yum-groups-manager --name YUM --save groups.xml 'yum*'\fP
-+\fB yum-groups-manager --name YUM --save groups.xml \(aqyum*\(aq\fP
++\fB yum-groups-manager \-\-name YUM \-\-save groups.xml \(aqyum*\(aq\fP
.IP "After the above command, load the groups.xml data, work with the yum group, make the group not user visible, and remove the yum-skip-broken and yum-priorities packages from it:"
- \fB yum-groups-manager -n YUM --merge groups.xml --remove yum-skip-broken yum-priorities --not-user-visible\fP
+-\fB yum-groups-manager -n YUM --merge groups.xml --remove yum-skip-broken yum-priorities --not-user-visible\fP
++\fB yum-groups-manager \-n YUM \-\-merge groups.xml \-\-remove yum-skip-broken yum-priorities \-\-not\-user\-visible\fP
.IP "After the above commands, add a description and a translated name to the yum group:"
-\fB yum-groups-manager -n YUM --merge groups.xml --description 'This is a group with most of the yum packages in it' --translated-name 'en:yum packages'\fP
-+\fB yum-groups-manager -n YUM --merge groups.xml --description \(aqThis is a group with most of the yum packages in it\(aq --translated-name \(aqen:yum packages\(aq\fP
++\fB yum-groups-manager \-n YUM \-\-merge groups.xml \-\-description \(aqThis is a group with most of the yum packages in it\(aq \-\-translated\-name \(aqen:yum packages\(aq\fP
.SH "FILES"
\fByum-groups-manager\fP uses the yum libraries for retrieving information and
packages. If no configuration file is specified, the default yum
@@ -617,7 +1443,7 @@ index d855104..a5477d6 100644
To list ranges of the sizes of packages installed or available, use:
.IP
diff --git a/docs/yum-security.8 b/docs/yum-security.8
-index 7e260b0..9c8dbf3 100644
+index 7e260b0..c7d9c8b 100644
--- a/docs/yum-security.8
+++ b/docs/yum-security.8
@@ -6,13 +6,13 @@ yum security plugin
@@ -646,25 +1472,50 @@ index 7e260b0..9c8dbf3 100644
.br
.I \fR yum updateinfo * all
.br
-@@ -109,7 +109,7 @@ distribution.
+@@ -108,40 +108,40 @@ distribution.
+ .SH "GENERAL OPTIONS"
There are four options added to yum that are available in the "list updates", "info updates", "check-update" and "update" commands. They are:
.PP
- .IP "\fB\--advisory\fP"
+-.IP "\fB\--advisory\fP"
-This option includes packages coresponding to the advisory ID, Eg. FEDORA-2201-123.
+-.IP "\fB\--bz\fP"
++.IP "\fB\-\-advisory\fP"
+This option includes packages corresponding to the advisory ID, Eg. FEDORA-2201-123.
- .IP "\fB\--bz\fP"
++.IP "\fB\-\-bz\fP"
This option includes packages that say they fix a Bugzilla ID, Eg. 123.
- .IP "\fB\--cve\fP"
-@@ -123,7 +123,7 @@ This option includes packages that say they fix a security issue.
+-.IP "\fB\--cve\fP"
++.IP "\fB\-\-cve\fP"
+ This option includes packages that say they fix a CVE - Common Vulnerabilities and Exposures ID (http://cve.mitre.org/about/), Eg. CVE-2201-0123.
+-.IP "\fB\--bugfixes\fP"
++.IP "\fB\-\-bugfixes\fP"
+ This option includes packages that say they fix a bugfix issue.
+-.IP "\fB\--security\fP"
++.IP "\fB\-\-security\fP"
+ This option includes packages that say they fix a security issue.
+ .PP
+ .PP
.SH "EXAMPLES"
.PP
-To list all updates that are security relevant, and get a reutrn code on whether there are security updates use:
+To list all updates that are security relevant, and get a return code on whether there are security updates use:
.IP
- yum --security check-update
+-yum --security check-update
++yum \-\-security check-update
.PP
-@@ -141,7 +141,7 @@ To get a list of all BZs that are fixed for packages you have installed use:
+ To upgrade packages that have security errata (upgrades to the latest
+ available package) use:
+ .IP
+-yum --security update
++yum \-\-security update
+ .PP
+ To upgrade packages that have security errata (upgrades to the last
+ security errata package) use:
+ .IP
+-yum --security update-minimal
++yum \-\-security update-minimal
+ .PP
+ To get a list of all BZs that are fixed for packages you have installed use:
.IP
yum updateinfo list bugzillas
.PP
@@ -673,26 +1524,52 @@ index 7e260b0..9c8dbf3 100644
installed use:
.IP
yum updateinfo list all security
-@@ -185,6 +185,6 @@ James Antill <james.antill at redhat.com>.
+@@ -152,15 +152,15 @@ yum updateinfo info FEDORA-2707-4567
+ .PP
+ To update packages to the latest version which contain fixes for Bugzillas 123, 456 and 789; and all security updates use:
+ .IP
+-yum --bz 123 --bz 456 --bz 789 --security update
++yum \-\-bz 123 \-\-bz 456 \-\-bz 789 \-\-security update
+ .PP
+ To update to the packages which just update Bugzillas 123, 456 and 789; and all security updates use:
+ .IP
+-yum --bz 123 --bz 456 --bz 789 --security update-minimal
++yum \-\-bz 123 \-\-bz 456 \-\-bz 789 \-\-security update-minimal
+ .PP
+ To get an info list of the latest packages which contain fixes for Bugzilla 123; CVEs CVE-2207-0123 and CVE-2207-3210; and Fedora advisories FEDORA-2707-4567 and FEDORA-2707-7654 use:
+ .IP
+-yum --bz 123 --cve CVE-2207-0123 --cve CVE-2207-3210 --advisory FEDORA-2707-4567 --advisory FEDORA-2707-7654 info updates
++yum \-\-bz 123 \-\-cve CVE-2207-0123 \-\-cve CVE-2207-3210 \-\-advisory FEDORA-2707-4567 \-\-advisory FEDORA-2707-7654 info updates
+ .PP
+ To get a list of packages which are "new".
+ .IP
+@@ -183,8 +183,8 @@ James Antill <james.antill at redhat.com>.
+ .fi
+
.SH "BUGS"
- The update-minimal command ignores the --obsoletes flag.
+-The update-minimal command ignores the --obsoletes flag.
++The update-minimal command ignores the \-\-obsoletes flag.
-The update-minimal command can only directly affect things atm., so if you update pkgA minimally but that requires an update to pkgB then pkgB will be updated to the newest version by the depsolver. Also the above will happen even if you've also minimally updated pkgB, if either the direct (minimal) update for pkgB happens after or if the minimal update for pkgB doesn't satisy the requirements of pkgA.
+The update-minimal command can only directly affect things atm., so if you update pkgA minimally but that requires an update to pkgB then pkgB will be updated to the newest version by the depsolver. Also the above will happen even if you've also minimally updated pkgB, if either the direct (minimal) update for pkgB happens after or if the minimal update for pkgB doesn't satisfy the requirements of pkgA.
- The main "problem" is that if the data is not correct the plugin cannot work correctly. For instance "--bz 123" will not fix BZ 123 if a package is updated to fix that BZ without referencing that it does so in the updateinfo.xml.
+-The main "problem" is that if the data is not correct the plugin cannot work correctly. For instance "--bz 123" will not fix BZ 123 if a package is updated to fix that BZ without referencing that it does so in the updateinfo.xml.
++The main "problem" is that if the data is not correct the plugin cannot work correctly. For instance "\-\-bz 123" will not fix BZ 123 if a package is updated to fix that BZ without referencing that it does so in the updateinfo.xml.
diff --git a/docs/yum-utils.1 b/docs/yum-utils.1
-index fa830b6..fdfbe24 100644
+index fa830b6..3f858a8 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
+@@ -15,8 +15,9 @@ 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
+-\fBverifytree\fR - verify that a local yum repository is consistent
++\fBverifytree\fR \- verify that a local yum repository is consistent
\fByum\-builddep\fR \- installs missing dependencies to build a specified package
+ \fByum\-complete\-transaction\fR \- finds incomplete or aborted yum transactions and attempts to complete them
+ \fByum\-config\-manager\fR \- toggle yum repositories, add new repositories and set main yum configuration options
@@ -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
@@ -702,10 +1579,19 @@ index fa830b6..fdfbe24 100644
.SH "AUTHOR"
Shawn Starr <shawn.starr at rogers.com>
diff --git a/docs/yum-verify.1 b/docs/yum-verify.1
-index 706c38e..50ede75 100644
+index 706c38e..5246a1c 100644
--- a/docs/yum-verify.1
+++ b/docs/yum-verify.1
-@@ -24,7 +24,7 @@ only verify packages that are installed on the system.
+@@ -6,7 +6,7 @@ yum verify plugin
+ \fByum\fP [options] verify [package ...]
+ .SH "DESCRIPTION"
+ .PP
+-This plugin extends \fByum\fP with some commands that give verification information on the installed system, much like rpm -V. You can change how the verification is done and which files it applies to.
++This plugin extends \fByum\fP with some commands that give verification information on the installed system, much like rpm \-V. You can change how the verification is done and which files it applies to.
+ .PP
+ added yum \fIcommand\fPs are:
+ .br
+@@ -24,12 +24,12 @@ only verify packages that are installed on the system.
.br
.PP
.IP "\fBverify\fP"
@@ -714,7 +1600,30 @@ index 706c38e..50ede75 100644
output. It removes all false matches due to multilib and ignores changes to
configuration files by default.
.IP
-@@ -53,15 +53,15 @@ yum verify-rpm
+ .IP "\fBverify-rpm\fP"
+-Is meant to be 100% compatible with rpm -V output, and any differences should be
++Is meant to be 100% compatible with rpm \-V output, and any differences should be
+ considered as bugs.
+ .IP
+ .IP "\fBverify-all\fP"
+@@ -39,29 +39,29 @@ Is used to list all the differences, including some that rpm itself will ignore.
+ These are the options added to yum that are available in the verify commands.
+ They are:
+ .PP
+-.IP "\fB\--verify-filenames\fP"
++.IP "\fB\-\-verify\-filenames\fP"
+ This option is used to limit the filenames that the packages will perform
+ verification.
+-.IP "\fB\--verify-configuration-files\fP"
++.IP "\fB\-\-verify\-configuration\-files\fP"
+ This option is only useful in the generic verify command, and will
+ enable/disable verification of files that are tagged as configuration files.
+ .SH "EXAMPLES"
+ .PP
+-To do the same as rpm -Va, use:
++To do the same as rpm \-Va, use:
+ .IP
+ yum verify-rpm
.PP
To verify the packages starting with the name yum, use:
.IP
@@ -724,12 +1633,12 @@ index 706c38e..50ede75 100644
To verify the binaries that are in a bin directory, use:
.IP
-yum verify --verify-filenames='*bin/*'
-+yum verify --verify-filenames=\(aq*bin/*\(aq
++yum verify \-\-verify\-filenames=\(aq*bin/*\(aq
.PP
To verify all include files, Eg. for multilib problems, use:
.IP
-yum verify-all --verify-filenames='/usr/include/*'
-+yum verify-all --verify-filenames=\(aq/usr/include/*\(aq
++yum verify-all \-\-verify\-filenames=\(aq/usr/include/*\(aq
.SH "SEE ALSO"
.nf
@@ -743,9 +1652,18 @@ index 706c38e..50ede75 100644
Should you find any other bugs, you should first
diff --git a/docs/yum-versionlock.1 b/docs/yum-versionlock.1
-index f68665e..ee5f053 100644
+index f68665e..f7cd467 100644
--- a/docs/yum-versionlock.1
+++ b/docs/yum-versionlock.1
+@@ -3,7 +3,7 @@
+ .\"
+ .TH YUM-VERSIONLOCK 1 "28 December 2009" "" "User Manuals"
+ .SH NAME
+-yum-versionlock - Version lock rpm packages
++yum-versionlock \- Version lock rpm packages
+ .SH SYNOPSIS
+ .B yum-versionlock
+ [ package-name [ package-name]] ...
@@ -67,7 +67,7 @@ Panu Matilainen <pmatilai at laiskiainen.org>
.br
James Antill <james at and.org>
@@ -755,6 +1673,44 @@ index f68665e..ee5f053 100644
.br
Gerhardus Geldenhuis <gerhardus.geldenhuis at gmail.com>
.SH "SEE ALSO"
+diff --git a/docs/yumdb.8 b/docs/yumdb.8
+index 63a3c6b..600a3a9 100644
+--- a/docs/yumdb.8
++++ b/docs/yumdb.8
+@@ -1,7 +1,7 @@
+ .\" yumdb command
+ .TH "yumdb" "8" "8 April 2010" "James Antill" ""
+ .SH "NAME"
+-yumdb command
++yumdb \- query and alter the Yum database
+ .SH "SYNOPSIS"
+ \fByumdb\fP [command] [packages ...]
+ .SH "DESCRIPTION"
+diff --git a/docs/yumdownloader.1 b/docs/yumdownloader.1
+index a8a3b16..e290268 100644
+--- a/docs/yumdownloader.1
++++ b/docs/yumdownloader.1
+@@ -1,7 +1,7 @@
+ .\" yumdownloader
+ .TH "yumdownloader" "1" "28 November 2005" "Gijs Hollestelle" ""
+ .SH "NAME"
+-yumdownloader
++yumdownloader \- download RPM packages from Yum repositories
+ .SH "SYNOPSIS"
+ \fByumdownloader\fP [options] package1 [package2...]
+ .SH "DESCRIPTION"
+@@ -31,9 +31,9 @@ for more information
+
+ .SH "EXAMPLES"
+ .IP "Download the kernel RPM to /var/tmp:"
+-\fByumdownloader --destdir /var/tmp kernel\fP
++\fByumdownloader \-\-destdir /var/tmp kernel\fP
+ .IP "List the URL for the kernel and kernel-smp RPMs:"
+-\fByumdownloader --urls kernel kernel-smp\fP
++\fByumdownloader \-\-urls kernel kernel-smp\fP
+ .PP
+ .SH "FILES"
+ As yumdownloader uses YUM libraries for retrieving all the information, it
diff --git a/find-repos-of-install.py b/find-repos-of-install.py
index 0578295..aac29ea 100644
--- a/find-repos-of-install.py
@@ -882,7 +1838,7 @@ index 6bc883f..a6946b0 100755
try:
cmdline = open('/proc/' +pid+ '/cmdline', 'r').read()
diff --git a/package-cleanup.py b/package-cleanup.py
-index 4794369..aebae67 100755
+index 4794369..acad9f2 100755
--- a/package-cleanup.py
+++ b/package-cleanup.py
@@ -12,11 +12,11 @@
@@ -935,7 +1891,7 @@ index 4794369..aebae67 100755
def _find_installed_duplicates(self, ignore_kernel=True):
"""find installed duplicate packages returns a dict of
pkgname = [[dupe1, dupe2], [dupe3, dupe4]] """
-@@ -282,12 +254,23 @@ class PackageCleanup(YumUtilBase):
+@@ -282,18 +254,29 @@ class PackageCleanup(YumUtilBase):
else:
kver = runningkernel
krel = ""
@@ -961,6 +1917,13 @@ index 4794369..aebae67 100755
print "Not removing kernel %s-%s because it is the running kernel" % (kver,krel)
else:
toremove.append(kernel)
+
+
+- # Now extend the list with all kernel-devel pacakges that either
++ # Now extend the list with all kernel-devel packages that either
+ # have no matching kernel installed or belong to a kernel that is to
+ # be removed
+ if not keepdevel:
@@ -314,9 +297,9 @@ class PackageCleanup(YumUtilBase):
self.setCacheDir()
@@ -1000,6 +1963,35 @@ index 39993ad..9ff927c 100644
for opt, repoexp in opts.repos:
if opt == '--disablerepo':
mdrs.add(repoexp)
+diff --git a/plugins/changelog/changelog.py b/plugins/changelog/changelog.py
+index 16144c6..d09281a 100644
+--- a/plugins/changelog/changelog.py
++++ b/plugins/changelog/changelog.py
+@@ -102,7 +102,7 @@ class ChangeLogCommand:
+ return ['changelog', 'ChangeLog']
+
+ def getUsage(self):
+- return "<date>|<number>|all [PACKAGE|all|installed|updates|extras|obsoletes|recent]"
++ return "[<date>|<number>|all] [PACKAGE|all|installed|updates|extras|obsoletes|recent]"
+
+ def getSummary(self):
+ return """\
+@@ -212,6 +212,15 @@ Display changelog data, since a specified time, on a group of packages"""
+ msg = "Argument -- %s -- is not valid: %s" % (since, to_str(e))
+ raise PluginYumExit(msg)
+
++ if self._since_dto == dateutil_parser.parse('garbage', fuzzy=True):
++ # 'since' was a package name, not a date
++ extcmds.insert(0, since)
++
++ # assume since="all"
++ self._since_all = True
++ self._since_dto = None
++ self._since_tt = None
++
+ ypl = base.returnPkgLists(extcmds)
+ self.show_data(msg, ypl.installed, 'Installed Packages')
+ self.show_data(msg, ypl.available, 'Available Packages')
diff --git a/plugins/downloadonly/downloadonly.conf b/plugins/downloadonly/downloadonly.conf
deleted file mode 100644
index 8e4d76c..0000000
@@ -1761,7 +2753,7 @@ index ff77e0d..bef3b03 100755
# (c) Copyright Seth Vidal 2004
diff --git a/repoquery.py b/repoquery.py
-index a3bb111..403074b 100755
+index a3bb111..1531583 100755
--- a/repoquery.py
+++ b/repoquery.py
@@ -8,11 +8,11 @@
@@ -2173,17 +3165,23 @@ index a3bb111..403074b 100755
if opts.repofrompath:
# setup the fake repos
for repo in opts.repofrompath:
-@@ -1328,7 +1438,8 @@ def main(args):
+@@ -1327,8 +1437,13 @@ def main(args):
+ else:
baseurl = repopath
- repoq.add_enable_repo(repoid, baseurls=[baseurl],
+- repoq.add_enable_repo(repoid, baseurls=[baseurl],
- basecachedir=repoq.conf.cachedir)
-+ basecachedir=repoq.conf.cachedir,
-+ timestamp_check=False)
++ try:
++ repoq.add_enable_repo(repoid, baseurls=[baseurl],
++ basecachedir=repoq.conf.cachedir,
++ timestamp_check=False)
++ except yum.Errors.DuplicateRepoError, e:
++ repoq.logger.error(e)
++ continue
if not opts.quiet:
repoq.logger.info( "Added %s repo from %s" % (repoid,repopath))
-@@ -1359,6 +1470,13 @@ def main(args):
+@@ -1359,6 +1474,13 @@ def main(args):
if opts.show_dupes:
repoq.conf.showdupesfromrepos = True
@@ -2197,20 +3195,20 @@ index a3bb111..403074b 100755
if opts.repoid:
found_repos = set()
for repo in repoq.repos.findRepos('*'):
-@@ -1381,6 +1499,12 @@ def main(args):
+@@ -1380,6 +1502,12 @@ def main(args):
+ for repo in repoq.repos.findRepos(repo_match):
repo.enable()
- try:
-+ repoq.doLock()
-+ except yum.Errors.LockError, e:
++ while True:
++ try: repoq.doLock(); break
++ except yum.Errors.LockError, e: pass
+ repoq.logger.error(e)
-+ sys.exit(50)
++ time.sleep(2)
+
-+ try:
+ try:
if not hasattr(repoq, 'arch'):
repoq.doSackSetup(archlist=archlist)
- elif archlist is not None:
-@@ -1396,10 +1520,15 @@ def main(args):
+@@ -1396,10 +1524,15 @@ def main(args):
except (yum.Errors.RepoError, yum.Errors.GroupsError), e:
repoq.logger.error(e)
sys.exit(1)
@@ -2679,7 +3677,7 @@ index d7a37c3..b9e682a 100755
for d in rpm.ds(spec.sourceHeader, 'requires'):
buildreqs.append(d.DNEVR()[2:])
diff --git a/yum-complete-transaction.py b/yum-complete-transaction.py
-index c5074ab..b61df9c 100755
+index c5074ab..3a9f305 100755
--- a/yum-complete-transaction.py
+++ b/yum-complete-transaction.py
@@ -8,11 +8,11 @@
@@ -2706,6 +3704,16 @@ index c5074ab..b61df9c 100755
VERSION = '1.0'
USAGE = """
yum-complete-transaction: completes unfinished yum transactions which occur due to error, failure
+@@ -115,7 +115,8 @@ class YumCompleteTransaction(YumUtilBase):
+ else:
+ self.optparser_grp = self.optparser
+ self.addCmdOptions()
+- self.main()
++ try: self.main()
++ finally: self.unlock()
+
+ def clean_up_ts_files(self, timestamp, path, disable=False):
+
diff --git a/yum-config-manager.py b/yum-config-manager.py
index 50f5123..aed64a2 100755
--- a/yum-config-manager.py
diff --git a/yum-utils.spec b/yum-utils.spec
index ae71f95..42d8edf 100644
--- a/yum-utils.spec
+++ b/yum-utils.spec
@@ -10,7 +10,7 @@
Summary: Utilities based around the yum package manager
Name: yum-utils
Version: 1.1.31
-Release: 15%{?dist}
+Release: 16%{?dist}
License: GPLv2+
Group: Development/Tools
Source: http://yum.baseurl.org/download/yum-utils/%{name}-%{version}.tar.gz
@@ -677,6 +677,18 @@ fi
%{pluginhome}/puppetverify.*
%changelog
+* Thu Jul 25 2013 Zdenek Pavlas <zpavlas at redhat.com> - 1.1.31-16
+- Update to latest HEAD
+- Fix pacakge => package typos
+- docs: Add missing man page short descriptions
+- docs: Escape dashes in command-line options
+- docs: Add missing man pages for all yum-utils
+- Add --show-duplicates to repoquery manpage. BZ 975565
+- yum-complete-transaction: unlock yum.pid. BZ 984119
+- sanitize repoquery --repofrompath. BZ 988140
+- yum changelog: implicit since=all. BZ 961782
+- repoquery: retry doLock() BZ 988223
+
* Mon Jun 24 2013 Zdenek Pavlas <zpavlas at redhat.com> - 1.1.31-15
- Update to latest HEAD
- debuginfo-install: handle YumBaseError
More information about the scm-commits
mailing list