Hello community,
here is the log from the commit of package yum-utils
checked in at Mon Oct 2 15:30:23 CEST 2006.
--------
--- yum-utils/yum-utils.changes 2006-09-26 14:38:13.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yum-utils/yum-utils.changes 2006-10-01 11:44:07.000000000 +0200
@@ -1,0 +2,5 @@
+Sun Oct 1 11:43:58 CEST 2006 - cthiel@suse.de
+
+- updated yum-utils-HEAD.patch
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yum-utils.spec ++++++
--- /var/tmp/diff_new_pack.zh6T0W/_old 2006-10-02 15:30:13.000000000 +0200
+++ /var/tmp/diff_new_pack.zh6T0W/_new 2006-10-02 15:30:13.000000000 +0200
@@ -13,7 +13,7 @@
Name: yum-utils
BuildRequires: python-devel
Version: 0.6
-Release: 10
+Release: 12
License: GPL
Group: System/Packages
Summary: Utilities based around the yum package manager
@@ -57,6 +57,8 @@
%{_mandir}/*/*
%changelog -n yum-utils
+* Sun Oct 01 2006 - cthiel@suse.de
+- updated yum-utils-HEAD.patch
* Tue Sep 26 2006 - cthiel@suse.de
- updated yum-utils-HEAD.patch to latests cvs HEAD
- removed versioned requires to python
++++++ yum-utils-HEAD.patch ++++++
--- /var/tmp/diff_new_pack.zh6T0W/_old 2006-10-02 15:30:13.000000000 +0200
+++ /var/tmp/diff_new_pack.zh6T0W/_new 2006-10-02 15:30:13.000000000 +0200
@@ -1,5 +1,5 @@
--- package-cleanup.py 2006-02-24 22:32:28.000000000 +0100
-+++ yum-utils/package-cleanup.py 2006-09-18 17:43:44.000000000 +0200
++++ package-cleanup.py 2006-09-18 17:43:44.000000000 +0200
@@ -29,17 +29,15 @@
import os
import sys
@@ -51,12 +51,12 @@
(n,a,e,v,r) = pkgtup
if n == "gpg-pubkey":
--- plugins/allowdowngrade/allowdowngrade.conf 1970-01-01 01:00:00.000000000 +0100
-+++ yum-utils/plugins/allowdowngrade/allowdowngrade.conf 2006-09-05 20:53:29.000000000 +0200
++++ plugins/allowdowngrade/allowdowngrade.conf 2006-09-05 20:53:29.000000000 +0200
@@ -0,0 +1,2 @@
+[main]
+enabled=1
--- plugins/allowdowngrade/allowdowngrade.py 1970-01-01 01:00:00.000000000 +0100
-+++ yum-utils/plugins/allowdowngrade/allowdowngrade.py 2006-09-05 20:53:29.000000000 +0200
++++ plugins/allowdowngrade/allowdowngrade.py 2006-09-05 20:53:29.000000000 +0200
@@ -0,0 +1,34 @@
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -93,17 +93,24 @@
+ tsInfo.probFilterFlags.append(RPMPROB_FILTER_OLDPACKAGE)
+
--- plugins/changelog/changelog.py 2005-11-04 01:56:49.000000000 +0100
-+++ yum-utils/plugins/changelog/changelog.py 2006-09-05 20:53:29.000000000 +0200
-@@ -19,9 +19,7 @@
++++ plugins/changelog/changelog.py 2006-10-01 11:39:48.000000000 +0200
+@@ -19,13 +19,11 @@
# the costly 'otherdata' import.
import time
-from yum.packages import YumInstalledPackage
from rpmUtils.miscutils import splitFilename
-from yum.constants import *
- from yum.plugins import TYPE_INTERFACE
+-from yum.plugins import TYPE_INTERFACE
++from yum.plugins import TYPE_INTERACTIVE
- requires_api_version = '2.1'
+-requires_api_version = '2.1'
+-plugin_type = (TYPE_INTERFACE,)
++requires_api_version = '2.5'
++plugin_type = (TYPE_INTERACTIVE,)
+
+ origpkgs = {}
+ changelog = 0
@@ -69,8 +67,6 @@
parser.add_option('--changelog', action='store_true',
help='Show changelog delta of updated packages')
@@ -113,21 +120,28 @@
def postreposetup_hook(conduit):
global changelog
opts, args = conduit.getCmdLine()
-@@ -94,7 +90,11 @@
- # store the latest date in changelog entries
- times = hdr['changelogtime']
- n,v,r,e,a = splitFilename(hdr['sourcerpm'])
-- origpkgs[n] = times[0]
-+ if len(times) == 0:
-+ # deal with packages without changelog
-+ origpkgs[n] = 0
-+ else:
-+ origpkgs[n] = times[0]
+@@ -89,11 +85,14 @@
+ ts = conduit.getTsInfo()
+ rpmdb = conduit.getRpmDB()
+ for tsmem in ts.getMembers():
+- for pkgtup in rpmdb.returnTupleByKeyword(name=tsmem.po.name, arch=tsmem.po.arch):
+- for hdr in rpmdb.returnHeaderByTuple(pkgtup):
+- # store the latest date in changelog entries
+- times = hdr['changelogtime']
+- n,v,r,e,a = splitFilename(hdr['sourcerpm'])
++ for po in rpmdb.searchNevra(name=tsmem.po.name, arch=tsmem.po.arch):
++ hdr = po.hdr
++ times = hdr['changelogtime']
++ n,v,r,e,a = splitFilename(hdr['sourcerpm'])
++ if len(times) == 0:
++ # deal with packages without changelog
++ origpkgs[n] = 0
++ else:
+ origpkgs[n] = times[0]
if conduit.confString('main', 'when', default='post') == 'pre':
- show_changes(conduit, 'Changes in packages about to be updated:')
--- plugins/fastestmirror/ChangeLog 2006-02-07 04:14:54.000000000 +0100
-+++ yum-utils/plugins/fastestmirror/ChangeLog 2006-06-15 04:24:53.000000000 +0200
++++ plugins/fastestmirror/ChangeLog 2006-06-15 04:24:53.000000000 +0200
@@ -1,3 +1,6 @@
+* Jun 14 2006 Luke Macken - 0.2.5
+- Use new yum 2.9.0 api
@@ -136,7 +150,7 @@
- Only write the timedhost file if we've re-pinged the mirrors
--- plugins/fastestmirror/fastestmirror.py 2006-02-10 06:47:32.000000000 +0100
-+++ yum-utils/plugins/fastestmirror/fastestmirror.py 2006-06-15 04:24:53.000000000 +0200
++++ plugins/fastestmirror/fastestmirror.py 2006-06-15 04:24:53.000000000 +0200
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
@@ -171,13 +185,13 @@
repo.setupGrab()
if not loadcache:
--- plugins/fedorakmod/fedorakmod.conf 2006-02-13 21:21:05.000000000 +0100
-+++ yum-utils/plugins/fedorakmod/fedorakmod.conf 2006-07-20 18:39:54.000000000 +0200
++++ plugins/fedorakmod/fedorakmod.conf 2006-07-20 18:39:54.000000000 +0200
@@ -1,2 +1,3 @@
[main]
enabled = 1
+pinkernels = 0
--- plugins/fedorakmod/fedorakmod.py 2006-02-13 21:21:05.000000000 +0100
-+++ yum-utils/plugins/fedorakmod/fedorakmod.py 2006-09-19 17:13:34.000000000 +0200
++++ plugins/fedorakmod/fedorakmod.py 2006-09-19 17:13:34.000000000 +0200
@@ -1,8 +1,8 @@
#!/usr/bin/python
@@ -500,7 +514,7 @@
+
+# vim:ts=4:expandtab
--- plugins/fedorakmod/README 2006-02-13 21:21:05.000000000 +0100
-+++ yum-utils/plugins/fedorakmod/README 2006-09-19 17:13:34.000000000 +0200
++++ plugins/fedorakmod/README 2006-09-19 17:13:34.000000000 +0200
@@ -5,11 +5,11 @@
To Do
@@ -518,7 +532,7 @@
+Jack Neely -- 07/05/2006
--- plugins/protectbase/protectbase.py 2005-07-17 04:26:40.000000000 +0200
-+++ yum-utils/plugins/protectbase/protectbase.py 2006-06-16 16:33:05.000000000 +0200
++++ plugins/protectbase/protectbase.py 2006-06-16 16:33:05.000000000 +0200
@@ -1,25 +1,47 @@
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -573,14 +587,14 @@
allrepos = conduit.getRepos().listEnabled()
--- plugins/versionlock/versionlock.conf 2005-06-16 18:34:00.000000000 +0200
-+++ yum-utils/plugins/versionlock/versionlock.conf 2006-09-06 07:24:37.000000000 +0200
++++ plugins/versionlock/versionlock.conf 2006-09-06 07:24:37.000000000 +0200
@@ -1,3 +1,3 @@
[main]
-enabled = 1
+enabled = 0
locklist = /etc/yum/pluginconf.d/versionlock.list
--- plugins/versionlock/versionlock.py 2006-01-11 07:52:45.000000000 +0100
-+++ yum-utils/plugins/versionlock/versionlock.py 2006-06-16 16:41:01.000000000 +0200
++++ plugins/versionlock/versionlock.py 2006-06-16 16:41:01.000000000 +0200
@@ -1,59 +1,55 @@
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
@@ -697,7 +711,7 @@
+ conduit.delPackage(pkg)
+ conduit.info(5, 'Excluding package %s due to version lock' % pkg)
--- repoclosure.py 2006-02-10 06:47:32.000000000 +0100
-+++ yum-utils/repoclosure.py 2006-09-26 14:12:25.000000000 +0200
++++ repoclosure.py 2006-09-26 14:12:25.000000000 +0200
@@ -23,14 +23,14 @@
import sys
import os
@@ -797,7 +811,7 @@
if __name__ == "__main__":
main()
--- repo-graph.py 2006-01-10 18:12:13.000000000 +0100
-+++ yum-utils/repo-graph.py 2006-09-26 14:12:25.000000000 +0200
++++ repo-graph.py 2006-09-26 14:12:25.000000000 +0200
@@ -33,8 +33,6 @@
"""
@@ -817,7 +831,7 @@
my.repos.setCacheDir(cachedir)
--- repomanage.py 2005-11-26 16:31:36.000000000 +0100
-+++ yum-utils/repomanage.py 2006-05-24 17:40:48.000000000 +0200
++++ repomanage.py 2006-05-24 17:40:48.000000000 +0200
@@ -30,6 +30,8 @@
from yum import misc
from exceptions import Exception
@@ -986,7 +1000,7 @@
else:
print pkg
--- repoquery.py 2006-05-07 02:42:01.000000000 +0200
-+++ yum-utils/repoquery.py 2006-09-18 17:43:17.000000000 +0200
++++ repoquery.py 2006-09-18 17:43:17.000000000 +0200
@@ -26,11 +26,11 @@
from optparse import OptionParser
@@ -1244,7 +1258,7 @@
repoq.runQuery(regexs)
--- repo-rss.py 2005-07-14 08:15:14.000000000 +0200
-+++ yum-utils/repo-rss.py 2006-09-26 14:12:25.000000000 +0200
++++ repo-rss.py 2006-09-26 14:12:25.000000000 +0200
@@ -28,9 +28,6 @@
def __init__(self):
yum.YumBase.__init__(self)
@@ -1265,7 +1279,7 @@
cachedir = getCacheDir()
if cachedir is None:
--- reposync.py 2006-05-07 03:47:11.000000000 +0200
-+++ yum-utils/reposync.py 2006-09-26 14:12:25.000000000 +0200
++++ reposync.py 2006-09-26 14:12:25.000000000 +0200
@@ -22,6 +22,8 @@
# make it work with mirrorlists (silly, really)
# man page/more useful docs
@@ -1377,7 +1391,7 @@
if __name__ == "__main__":
--- repotrack.py 2006-02-10 07:13:31.000000000 +0100
-+++ yum-utils/repotrack.py 2006-09-18 18:06:13.000000000 +0200
++++ repotrack.py 2006-09-18 18:06:13.000000000 +0200
@@ -25,6 +25,7 @@
import sys
from optparse import OptionParser
@@ -1442,7 +1456,7 @@
if __name__ == "__main__":
--- yum-builddep.py 2006-05-07 03:22:28.000000000 +0200
-+++ yum-utils/yum-builddep.py 2006-09-18 17:31:50.000000000 +0200
++++ yum-builddep.py 2006-09-18 17:31:50.000000000 +0200
@@ -20,8 +20,8 @@
import cli
import yum
@@ -1502,7 +1516,7 @@
base.listTransaction()
base.doTransaction()
--- yumdownloader.py 2006-05-07 03:37:14.000000000 +0200
-+++ yum-utils/yumdownloader.py 2006-09-26 14:12:25.000000000 +0200
++++ yumdownloader.py 2006-10-01 11:39:48.000000000 +0200
@@ -22,27 +22,27 @@
import yum.Errors
import os
@@ -1591,7 +1605,14 @@
if toActOn:
if opts.source:
-@@ -146,11 +169,12 @@
+@@ -140,17 +163,18 @@
+ remote = download.returnSimple('relativepath')
+ if opts.urls:
+ url = urljoin(repo.urls[0],remote)
+- my.log(0, '%s' % url)
++ logger.info('%s' % url)
+ continue
+ local = os.path.basename(remote)
local = os.path.join(opts.destdir, local)
if (os.path.exists(local) and
str(os.path.getsize(local)) == download.returnSimple('packagesize')):
@@ -1607,8 +1628,8 @@
if __name__ == '__main__':
main()
--- yum-utils.spec 2006-05-07 03:50:28.000000000 +0200
-+++ yum-utils.spec 2006-09-05 21:05:27.000000000 +0200
-@@ -102,6 +102,15 @@
++++ yum-utils.spec 2006-10-01 11:39:48.000000000 +0200
+@@ -102,6 +102,24 @@
This plugin adds a --downloadonly flag to yum so that yum will only download
the packages and not install/update them.
@@ -1621,19 +1642,28 @@
+This plugin adds a --allow-downgrade flag to yum to make it possible to
+manually downgrade packages to specific versions.
+
++%package -n yum-skip-broken
++Summary: Yum plugin to handle skiping packages with dependency problems
++Group: System Environment/Base
++Requires: yum > 2.6.0
++
++%description -n yum-skip-broken
++This plugin adds a --ignore-broken to yum to make it possible to
++check packages for dependency problems and skip the one with problems.
++
%prep
%setup -q
-@@ -111,7 +120,7 @@
+@@ -111,7 +129,7 @@
make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install
# Plugins to install
-plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly"
-+plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade"
++plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken"
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
cd plugins
-@@ -136,7 +145,7 @@
+@@ -136,7 +154,7 @@
%defattr(-, root, root)
%doc README
%doc COPYING
@@ -1642,7 +1672,7 @@
%{_bindir}/package-cleanup
%{_bindir}/repoclosure
%{_bindir}/repomanage
-@@ -195,7 +204,18 @@
+@@ -195,7 +213,26 @@
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/downloadonly.conf
/usr/lib/yum-plugins/downloadonly.*
@@ -1651,7 +1681,15 @@
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/allowdowngrade.conf
+/usr/lib/yum-plugins/allowdowngrade.*
+
++%files -n yum-skip-broken
++%defattr(-, root, root)
++%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/skip-broken.conf
++/usr/lib/yum-plugins/skip-broken.*
++
%changelog
++* Wed Sep 27 2006 Tim Lauridsen
++- added skip-broken plugin
++
+* Tue Sep 05 2006 Panu Matilainen
+- added allowdowngrade plugin
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org