[yum-commits] 3 commits - docs/repoquery.1 docs/show-installed.1 docs/yum-filter-data.1 docs/yum-groups-manager.1 docs/yum-list-data.1 docs/yum-verify.1 plugins/priorities yum-builddep.py yumdownloader.py
James Antill
james at osuosl.org
Wed Sep 21 13:55:15 UTC 2011
docs/repoquery.1 | 2 +-
docs/show-installed.1 | 2 +-
docs/yum-filter-data.1 | 12 ++++++------
docs/yum-groups-manager.1 | 4 ++--
docs/yum-list-data.1 | 2 +-
docs/yum-verify.1 | 6 +++---
plugins/priorities/priorities.py | 4 ++++
yum-builddep.py | 2 +-
yumdownloader.py | 4 ++--
9 files changed, 21 insertions(+), 17 deletions(-)
New commits:
commit 7e78967f67f496e6af84caa8e6f47ac63aefcb66
Author: James Antill <james at and.org>
Date: Wed Sep 21 09:54:54 2011 -0400
Workaround YumBase.up update problem with manual excludes. BZ 734428.
diff --git a/plugins/priorities/priorities.py b/plugins/priorities/priorities.py
index 202c203..0cdfae2 100644
--- a/plugins/priorities/priorities.py
+++ b/plugins/priorities/priorities.py
@@ -164,6 +164,10 @@ def exclude_hook(conduit):
break
if cnt:
conduit.info(2, '%d packages excluded due to repository priority protections' % cnt)
+ if check_obsoletes:
+ # Atm. the update object doesn't get updated when we manually exclude
+ # things ... so delete it. This needs to be re-written.
+ conduit._base.up = None
def _pkglist_to_dict(pl, priority, addArch = False):
out = dict()
commit 843b0459a862df14097c9c231fb123253b2b9007
Author: Zdeněk Pavlas <zpavlas at redhat.com>
Date: Tue Sep 13 08:54:59 2011 +0200
Force ASCII apostrophes in man page examples. BZ 659740.
Use Groff's \(aq (vertical apostrophe quote) in examples.
This prevents rendering them as UTF8 0xe2 0x80 0x99
which does not work when copy-pasted.
Patch suggested by Ivana Varekova.
diff --git a/docs/repoquery.1 b/docs/repoquery.1
index b1d0a08..fe842f5 100644
--- a/docs/repoquery.1
+++ b/docs/repoquery.1
@@ -167,7 +167,7 @@ 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
.IP "List all package names and the repository they come from, nicely formatted:"
diff --git a/docs/show-installed.1 b/docs/show-installed.1
index 82b4a5f..18c4af8 100644
--- a/docs/show-installed.1
+++ b/docs/show-installed.1
@@ -16,7 +16,7 @@ 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
.B \-i INPUT, \-\-input=INPUT
-File to read the package list from instead of using the rpmdb. \- for stdin. The file must contain package names only separated by white space (including newlines). rpm \-qa \-\-qf='%{name}\\n' produces proper output.
+File to read the package list from instead of using the rpmdb. \- for stdin. The file must contain package names only separated by white space (including newlines). rpm \-qa \-\-qf=\(aq%{name}\\n\(aq produces proper output.
.TP
.B \-o OUTPUT, \-\-output=OUTPUT
File to write the result to. Stdout is used if option is omitted.
diff --git a/docs/yum-filter-data.1 b/docs/yum-filter-data.1
index b679162..b26f1fd 100644
--- a/docs/yum-filter-data.1
+++ b/docs/yum-filter-data.1
@@ -77,23 +77,23 @@ 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
.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
.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
.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
.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
.SH "SEE ALSO"
.nf
@@ -109,7 +109,7 @@ James Antill <james.antill at redhat.com>.
.SH "BUGS"
Currently yum can't filter packages in all of the commands, so for instance
-"yum list 'yum*'" doesn't get the results filtered.
+"yum list \(aqyum*\(aq" doesn't get the results filtered.
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-groups-manager.1 b/docs/yum-groups-manager.1
index 0451cc9..c256c45 100644
--- a/docs/yum-groups-manager.1
+++ b/docs/yum-groups-manager.1
@@ -77,11 +77,11 @@ in yum.
.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
.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
.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
.SH "FILES"
\fByum-groups-manager\fP uses the yum libraries for retrieving information and
packages. If no configuration file is specified, the default yum
diff --git a/docs/yum-list-data.1 b/docs/yum-list-data.1
index 058dc54..a5477d6 100644
--- a/docs/yum-list-data.1
+++ b/docs/yum-list-data.1
@@ -127,7 +127,7 @@ yum list-rpm-groups updates
.PP
To list all the committers to packages that have yum in their name, use:
.IP
-yum list-committers 'yum*'
+yum list-committers \(aqyum*\(aq
.PP
To list ranges of the sizes of packages installed or available, use:
.IP
diff --git a/docs/yum-verify.1 b/docs/yum-verify.1
index c529fee..50ede75 100644
--- a/docs/yum-verify.1
+++ b/docs/yum-verify.1
@@ -53,15 +53,15 @@ yum verify-rpm
.PP
To verify the packages starting with the name yum, use:
.IP
-yum verify 'yum*'
+yum verify \(aqyum*\(aq
.PP
To verify the binaries that are in a bin directory, use:
.IP
-yum verify --verify-filenames='*bin/*'
+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
.SH "SEE ALSO"
.nf
commit 7b6ec4c17860c9a87f72b0a98e3b7effe9f2dd3d
Author: Zdeněk Pavlas <zpavlas at redhat.com>
Date: Tue Sep 13 12:13:39 2011 +0200
Adjust logic for source repos in CDN. BZ 710469, BZ 732649.
We're not sure which of the two source repo naming conventions
is used, so search for both.
diff --git a/yum-builddep.py b/yum-builddep.py
index 642c66c..f24bfce 100755
--- a/yum-builddep.py
+++ b/yum-builddep.py
@@ -128,7 +128,7 @@ class YumBuildDep(YumUtilBase):
issource_repo = True
if rhn_source_repos and (not repo.id.endswith('-source-rpms') and
repo.id.endswith('-rpms')):
- srcrepo = repo.id.replace('-rpms', '-source-rpms')
+ srcrepo = '%s-source,%s-source-rpms' % (repo.id, repo.id[:-5])
elif not issource_repo:
srcrepo = '%s-source' % repo.id
else:
diff --git a/yumdownloader.py b/yumdownloader.py
index 95144f1..8abecb4 100755
--- a/yumdownloader.py
+++ b/yumdownloader.py
@@ -114,9 +114,9 @@ class YumDownloader(YumUtilBase):
# Get all src repos.
src_repos = {}
+ repos_source = self.repos.findRepos('*-source')
if rhn_source_repos: # RHN
repos_source += self.repos.findRepos('*-source-rpms')
- repos_source = self.repos.findRepos('*-source')
for repo in repos_source:
src_repos[repo.id] = False
@@ -131,7 +131,7 @@ class YumDownloader(YumUtilBase):
continue
if not repo.id.endswith("-rpms"):
continue
- srcrepo = repo.id.replace('-rpms', '-source-rpms')
+ srcrepo = repo.id[:-len('-rpms')] + '-source-rpms'
if srcrepo in src_repos:
src_repos[srcrepo] = True
More information about the Yum-commits
mailing list