rpms/pungi/F-7 pungi-dupedeps.patch,NONE,1.1 pungi.spec,1.21,1.22
Jesse Keating (jkeating)
fedora-extras-commits at redhat.com
Wed Jun 20 14:35:00 UTC 2007
Author: jkeating
Update of /cvs/pkgs/rpms/pungi/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21534
Modified Files:
pungi.spec
Added Files:
pungi-dupedeps.patch
Log Message:
* Wed Jun 20 2007 Jesse Keating <jkeating at redhat.com> - 0.3.7-2
- Fix a bug where new and old copies of a package were being included
pungi-dupedeps.patch:
--- NEW FILE pungi-dupedeps.patch ---
changeset: 259:9f9a18d15637
tag: tip
user: Jesse Keating <jkeating at redhat dot com>
date: Tue Jun 19 22:19:19 2007 -0400
summary: Create a little package sack out of dep providers to grab just the newest ones
diff -r 98bb99f7295b -r 9f9a18d15637 pypungi/gather.py
--- a/pypungi/gather.py Wed Jun 13 18:04:20 2007 -0400
+++ b/pypungi/gather.py Tue Jun 19 22:19:19 2007 -0400
@@ -119,7 +119,9 @@ class Gather(yum.YumBase):
self.logger.warn("Unresolvable dependency %s in %s.%s" % (r, po.name, po.arch))
continue
- for dep in deps:
+ depsack = yum.packageSack.ListPackageSack(deps)
+
+ for dep in depsack.returnNewestByNameArch():
self.tsInfo.addInstall(dep)
if not self.config.has_option('default', 'quiet'):
self.logger.info('Added %s.%s for %s.%s' % (dep.name, dep.arch, po.name, po.arch))
Index: pungi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/F-7/pungi.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pungi.spec 30 May 2007 16:14:02 -0000 1.21
+++ pungi.spec 20 Jun 2007 14:34:24 -0000 1.22
@@ -2,13 +2,14 @@
Name: pungi
Version: 0.3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Distribution compose tool
Group: Development/Tools
License: GPL
URL: http://hosted.fedoraproject.org/projects/pungi
Source0: http://linux.duke.edu/projects/%{name}/release/%{name}-%{version}.tar.gz
+Patch0: pungi-dupedeps.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: anaconda-runtime, yum => 3.0.3
BuildRequires: python-devel
@@ -21,6 +22,7 @@
%prep
%setup -q
+%patch0 -p1
%build
@@ -46,6 +48,9 @@
%changelog
+* Wed Jun 20 2007 Jesse Keating <jkeating at redhat.com> - 0.3.7-2
+- Fix a bug where new and old copies of a package were being included
+
* Wed May 30 2007 Jesse Keating <jkeating at redhat.com> - 0.3.7-1
- Handle the cdsize variable correctly
- More fixes for cached download stuff
More information about the scm-commits
mailing list