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 3113539c537924409d7f6357ead4420c5e29a685
Author: Simon McVittie <s...@debian.org>
Date: Fri Jan 12 10:51:56 2018 +0000
GameData.load_file_data: Always update set of packages that rip CDs
Since commit 10083aed we skip the later part of this function (which
is only meant to contain sanity-checks, not functionally significant
code) when running as a system-wide installation. Updating
rip_cd_packages is functionally significant and so needs to move
above that check.
Closes: #886965
Signed-off-by: Simon McVittie <s...@debian.org>
---
debian/changelog | 3 +++
game_data_packager/game.py | 11 ++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f5e3858..464d277 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ game-data-packager (56) UNRELEASED; urgency=medium
- Fix a typo in previous changelog entry [adetiste]
- Add missing bug reference for #876321 in previous changelog entry
[adetiste]
+ - Fix a regression where g-d-p could no longer rip CD audio. Thanks
+ to Paul Preuss for locating the relevant commit.
+ (Closes: #886965) [smcv]
- `g-d-p make-template` now appears in --help output [smcv]
- Make `g-d-p make-template` able to merge new versions into existing
games (the result is very rough and will usually need editing, but
diff --git a/game_data_packager/game.py b/game_data_packager/game.py
index 48f0de3..de15f50 100644
--- a/game_data_packager/game.py
+++ b/game_data_packager/game.py
@@ -898,6 +898,12 @@ class GameData(object):
if f.sha256 is not None:
self.known_sha256s.setdefault(f.sha256, set()).add(filename)
+ for package in self.packages.values():
+ if package.rip_cd:
+ # we only support Ogg Vorbis for now
+ assert package.rip_cd['encoding'] == 'vorbis', package.name
+ self.rip_cd_packages.add(package)
+
if not check:
return
@@ -914,11 +920,6 @@ class GameData(object):
# consistency check
for package in self.packages.values():
- if package.rip_cd:
- # we only support Ogg Vorbis for now
- assert package.rip_cd['encoding'] == 'vorbis', package.name
- self.rip_cd_packages.add(package)
-
# there had better be something it wants to install, unless
# specifically marked as empty
if package.empty:
--
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
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
