Add 'make log' command to print changelog for spec. (Daniel Mach)

- Implement %prepopulate config section as an additional package input. (Daniel Mach)
- Don't automatically apply fulltree on input multilib packages. (Daniel Mach)
- Implement %multilib-blacklist and %multilib-whitelist config sections. (Daniel Mach)
- Turn off fulltree for multilib packages. (Daniel Mach)
- Return package flags: input, fulltree-exclude, langpack, multilib, fulltree (Daniel Mach)
- Exclude srpms from conditional deps. (Daniel Mach)
- Improve greedy methods: none, all, build. (Daniel Mach)
- Add .gitignore. (Daniel Mach)
- Add 'yaboot' multilib method. (Daniel Mach)
- Drop pulseaudio-utils from runtime whitelist (Daniel Mach)
- Remove packages which are in lookaside repos from regular repos. (Daniel Mach)
- Print repoid to make clear from which repo a package came. (Daniel Mach)
- Don't pull conditional deps in when --nodeps is used. (Daniel Mach)
- Multilib fix - consider only *.so* libs which are also listed in Provides. (Daniel Mach)
- Fix --nodeps by setting Pungi.is_resolve_deps according to config. (Daniel Mach)
- Add test_arch.py. (Daniel Mach)
This commit is contained in:
Dennis Gilmore 2013-10-31 13:45:05 -05:00
parent 54bbf1f1c0
commit 0d61b243c6
4 changed files with 22 additions and 41 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ pungi-2.1.2.tar.bz2
/pungi-2.12.tar.bz2
/pungi-2.13.tar.bz2
/pungi-3.00.tar.bz2
/pungi-3.01.tar.bz2

View File

@ -1,39 +0,0 @@
diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py
index 059b748..337b32a 100644
--- a/src/pypungi/__init__.py
+++ b/src/pypungi/__init__.py
@@ -506,22 +506,22 @@ class Pungi(pypungi.PungiBase):
else:
# nogreedy
for name in searchlist:
- arch = None
- if "." in name:
- name, arch = name.rsplit(".", 1)
+ packages_by_name = {}
+ exactmatched, matched, unmatched = yum.packages.parsePackages(self.ayum.pkgSack.returnPackages(), [name], casematch=1)
+ matches = filter(self._filtersrcdebug, exactmatched + matched)
- pkg_sack = self.ayum.pkgSack.searchNevra(name=name, arch=arch)
- # filter sources out of the package sack
- pkg_sack = [ i for i in pkg_sack if i.arch not in ("src", "nosrc") ]
- pkg_sack = self.excludePackages(pkg_sack)
-
- match = self.ayum._bestPackageFromList(pkg_sack)
- if not match:
+ if not matches:
self.logger.warn('Could not find a match for %s in any configured repo' % name)
continue
- self.ayum.tsInfo.addInstall(match)
- self.logger.info('Found %s.%s' % (match.name, match.arch))
+ for i in matches:
+ packages_by_name.setdefault(i.name, []).append(i)
+
+ for i, pkg_sack in packages_by_name.iteritems():
+ pkg_sack = self.excludePackages(pkg_sack)
+ match = self.ayum._bestPackageFromList(pkg_sack)
+ self.ayum.tsInfo.addInstall(match)
+ self.logger.info('Found %s.%s' % (match.name, match.arch))
if len(self.ayum.tsInfo) == 0:
raise yum.Errors.MiscError, 'No packages found to download.'

View File

@ -1,7 +1,7 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: pungi
Version: 3.00
Version: 3.01
Release: 1%{?dist}
Summary: Distribution compose tool
@ -55,6 +55,25 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Oct 27 2013 Daniel Mach <dmach@redhat.com> - 3.01-1
- Add 'make log' command to print changelog for spec. (Daniel Mach)
- Implement %prepopulate config section as an additional package input. (Daniel Mach)
- Don't automatically apply fulltree on input multilib packages. (Daniel Mach)
- Implement %multilib-blacklist and %multilib-whitelist config sections. (Daniel Mach)
- Turn off fulltree for multilib packages. (Daniel Mach)
- Return package flags: input, fulltree-exclude, langpack, multilib, fulltree (Daniel Mach)
- Exclude srpms from conditional deps. (Daniel Mach)
- Improve greedy methods: none, all, build. (Daniel Mach)
- Add .gitignore. (Daniel Mach)
- Add 'yaboot' multilib method. (Daniel Mach)
- Drop pulseaudio-utils from runtime whitelist (Daniel Mach)
- Remove packages which are in lookaside repos from regular repos. (Daniel Mach)
- Print repoid to make clear from which repo a package came. (Daniel Mach)
- Don't pull conditional deps in when --nodeps is used. (Daniel Mach)
- Multilib fix - consider only *.so* libs which are also listed in Provides. (Daniel Mach)
- Fix --nodeps by setting Pungi.is_resolve_deps according to config. (Daniel Mach)
- Add test_arch.py. (Daniel Mach)
* Tue Aug 20 2013 Dennis Gilmore <dennis@ausil.us> - 3.00-1
- apply patches from Daniel Mach
- make sure we only use mac support on x86_64

View File

@ -1 +1 @@
cbc89ebd54a3456b98b287f43753788c pungi-3.00.tar.bz2
593af3d31acdbdff744e719fb4fc8a7b pungi-3.01.tar.bz2