This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager.
commit 3c6e49d96732504d25f7c50be1552b80b78ea5e0 Author: Simon McVittie <[email protected]> Date: Wed Jan 21 10:52:33 2015 +0000 Simplify alternative handling, and do not log errors for optional files fill_gap() already understands alternatives, so fill_gaps() doesn't need to duplicate that logic. We should not log errors for inability to find any version of an optional file (e.g. repacking from an installed quake-armagon.deb from g-d-p <= 38, which certainly doesn't have the manual). --- lib/game_data_packager/__init__.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/game_data_packager/__init__.py b/lib/game_data_packager/__init__.py index a250855..2006229 100644 --- a/lib/game_data_packager/__init__.py +++ b/lib/game_data_packager/__init__.py @@ -994,15 +994,9 @@ class GameData(object): for filename in (package.install | package.optional): if filename not in self.found: wanted = self.files[filename] - - if wanted.alternatives: - for alt in wanted.alternatives: - self.fill_gap(package, self.files[alt], - download=download, log=log) - self.file_status[filename] |= self.file_status[alt] - else: - # updates file_status as a side-effect - self.fill_gap(package, wanted, download=download, log=log) + # updates file_status as a side-effect + self.fill_gap(package, wanted, download=download, + log=(filename in package.install)) logger.debug('%s: %s', filename, self.file_status[filename]) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
