[yum-git] 2 commits - docs/Makefile docs/yum-changelog.1 docs/yum-changelog.conf.5 docs/yum-versionlock.1 docs/yum-versionlock.conf.5 plugins/versionlock yum-utils.spec

Mon Jul 28 04:13:59 UTC 2008

docs/Makefile                      |    4 +-
 docs/yum-changelog.1               |   10 -------
 docs/yum-changelog.conf.5          |    8 ++---
 docs/yum-versionlock.1             |   42 ++++++++++++++++++++++++++++++
 docs/yum-versionlock.conf.5        |   51 +++++++++++++++++++++++++++++++++++++
 plugins/versionlock/versionlock.py |    1 
 yum-utils.spec                     |    8 ++++-
 7 files changed, 106 insertions(+), 18 deletions(-)

New commits:
commit 9e57ff4f731698faaf6ee36c4ae240a775c8ebc7
Author: James Antill <james at and.org>
Date:   Mon Jul 28 00:13:48 2008 -0400

    Add versionlock man pages

diff --git a/docs/Makefile b/docs/Makefile
index 40a8080..ad95261 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,6 +1,6 @@
 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
-DOCS5 = yum-changelog.conf
+       yum-list-data yum-filter-data yum-verify yum-utils yum-aliases yum-debug-dump yum-versionlock
+DOCS5 = yum-changelog.conf yum-versionlock.conf
 DOCS8 = yum-security yum-complete-transaction 
 
 all:
diff --git a/docs/yum-changelog.conf.5 b/docs/yum-changelog.conf.5
index ede996d..df7641d 100644
--- a/docs/yum-changelog.conf.5
+++ b/docs/yum-changelog.conf.5
@@ -18,18 +18,18 @@ By default, this plugin will show the changelogs before the updates.
 utilizes configuration options in the form of
 .IP OPTION=VALUE
 .SH OPTION
-.IP WHEN
+.IP when
 This option reflects when
 .B yum-changelog(1)
 will allow changelog viewing during yum updates.
 .SH VALUE
-.IP PRE
+.IP pre
 To make
 .B yum-changelog(5)
 show the changelog
 .B before
 the yum updates
-.IP POST
+.IP post
 To make
 .B yum-changelog(5)
 show the changelog
@@ -40,4 +40,4 @@ the yum updates.
 Chitlesh Goorah <chitlesh at fedoraproject.org>
 .RS
 .SH SEE ALSO
-.BR yum-changelog(1)
\ No newline at end of file
+.BR yum-changelog(1)
diff --git a/docs/yum-versionlock.1 b/docs/yum-versionlock.1
new file mode 100644
index 0000000..27afee3
--- /dev/null
+++ b/docs/yum-versionlock.1
@@ -0,0 +1,42 @@
+.\" PROCESS THIS FILE WITH
+.\" groff -man -Tascii yum-versionlock.1
+.\"
+.TH YUM-VERSIONLOCK 1 "27 JULY 2008" "" "User Manuals"
+.SH NAME
+.B yum-versionlock
+.SH SYNOPSIS
+The
+.B yum-versionlock
+package
+.SH DESCRIPTION
+.BR yum-versionlock(1)
+is a Yum plugin that takes a set of name/versions for packages and excludes all
+other versions of those packages (including optionally following obsoletes).
+This allows you to protect packages from being updated by newer versions,
+for example.
+.SH FILES
+.I /etc/yum/pluginconf.d/versionlock.conf
+.RS
+The system wide configuration file. See
+.BR yum-versionlock.conf(5)
+for more information.
+.RE
+.I /etc/yum/pluginconf.d/versionlock.list
+.RS
+The default place to put package version lock information (one package and
+version per. line).
+.RE
+.SH BUGS
+If you happen to run across a bug, you can report it via yum at lists.linux.duke.edu or filed in bugzilla.
+.SH AVAILABILITY
+yum-versionlock is available via:
+.nf
+# yum install yum-versionlock
+.fi
+.SH AUTHORS
+.RS
+Panu Matilainen <pmatilai at laiskiainen.org>
+.br
+James Antill <james at and.org>
+.SH "SEE ALSO"
+.BR yum(1)
diff --git a/docs/yum-versionlock.conf.5 b/docs/yum-versionlock.conf.5
new file mode 100644
index 0000000..d19bd0f
--- /dev/null
+++ b/docs/yum-versionlock.conf.5
@@ -0,0 +1,51 @@
+.\" PROCESS THIS FILE WITH
+.\" groff -man -Tascii yum-changelog.conf.5
+.\"
+.TH YUM-VERSIONLOCK.CONF 5 "27 JULY 2008" "" "File Formats"
+.SH NAME
+.B yum-versionlock.conf(5)
+
+.SH SYNOPSIS
+.B yum-versionlock.conf(5)
+is the configuration file for
+.B yum-versionlock(1)
+Yum plugin for excluding packages that aren't listed in the versionlock file.
+The plugin will walk each line of the versionlock file, parse out the name
+and version of the package. It will then exclude any package by that name that
+doesn't match one of the versions listed within the file (or, optionally, any
+obsoleter of that package).
+This is basically the same as doing an exclude for the package name itself (as
+you cannot exclude installed packages), but yum will still see the versions you
+have installed/versionlocked as available so that "yum reinstall" will still
+work, etc.
+.SH FILES
+.I /etc/yum/pluginconf.d/versionlock.conf
+.SH FILE FORMAT
+.B yum-versionlock.conf(5)
+utilizes configuration options in the form of
+.IP OPTION=VALUE
+.SH OPTION
+.IP follow_obsoletes
+This option is a boolean flag which specifies if the versionlock plugin should
+look at all the obsoletes, and see if any of the packages specified have an
+obsoleter. If an obsoleter is found then all versions of that package will be
+excluded. This option is off by default, as
+.B yum-versionlock(1)
+will take some time to do the obsoletes processing, and for non-rename
+obsoletes any issues you had which kept you at a specific version of a package
+should be different with another package.
+.SH OPTION
+.IP locklist
+This option is a string with points to the file which will have the versionlock
+information in it. Note that the file
+.B has
+to exist (or the versionlock plugin will make yum exit). However it can be
+empty.
+.SH AUTHOR
+.RS
+Chitlesh Goorah <chitlesh at fedoraproject.org>
+.br
+James Antill <james at fedoraproject.org>
+.RS
+.SH SEE ALSO
+.BR yum-versionlock(1)
diff --git a/plugins/versionlock/versionlock.py b/plugins/versionlock/versionlock.py
index 0de81e8..7caefc7 100644
--- a/plugins/versionlock/versionlock.py
+++ b/plugins/versionlock/versionlock.py
@@ -13,6 +13,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # by Panu Matilainen <pmatilai at laiskiainen.org>
+# tweaks by James Antill <james at and.org>
 #
 
 from yum.plugins import PluginYumExit
diff --git a/yum-utils.spec b/yum-utils.spec
index cbd45f4..ae0defa 100644
--- a/yum-utils.spec
+++ b/yum-utils.spec
@@ -74,8 +74,10 @@ Group: System Environment/Base
 Requires: yum >= 3.0
 
 %description -n yum-versionlock
-This plugin allows certain packages specified in a file to be protected from being updated by
-newer versions.
+This plugin takes a set of name/versions for packages and excludes all other
+versions of those packages (including optionally following obsoletes). This
+allows you to protect packages from being updated by newer versions,
+for example.
 
 %package -n yum-tsflags
 Summary: Yum plugin to add tsflags by a commandline option
@@ -357,6 +359,8 @@ fi
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.conf
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.list
 /usr/lib/yum-plugins/versionlock.*
+%{_mandir}/man1/yum-versionlock.1.*
+%{_mandir}/man5/yum-versionlock.conf.5.*
 
 %files -n yum-tsflags
 %defattr(-, root, root)
commit 5bb60ba946efd0e0a9ee68f9bfee5c124536225a
Author: James Antill <james at and.org>
Date:   Sun Jul 27 23:56:33 2008 -0400

    Remove copy and pasted extra text from yum-changelog man page

diff --git a/docs/yum-changelog.1 b/docs/yum-changelog.1
index 576a9cc..ca7468c 100644
--- a/docs/yum-changelog.1
+++ b/docs/yum-changelog.1
@@ -79,16 +79,6 @@ ktechlab - 0.3-6.i386
 .br
 - Rebuilt due to new gpsim-devel release
 .br
-.SH "FILES"
-As yumdownloader uses YUM libraries for retrieving all the information, it
-relies on YUM configuration for its default values like which repositories
-to use. Consult YUM documentation for details:
-.PP
-.nf
-/etc/yum.conf
-/etc/yum/repos.d/
-/var/cache/yum/
-.fi
 .SH BUGS
 If you happen to run across a bug, you can report it via yum at lists.linux.duke.edu or filed in bugzilla.
 .SH AVAILABILITY

