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 3cc1a88573d32ccab51c046d5aa1ee1eb3792021 Author: Simon McVittie <[email protected]> Date: Wed Jan 21 10:04:14 2015 +0000 Don't search paths associated with a package we aren't going to build --- lib/game_data_packager/__init__.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/game_data_packager/__init__.py b/lib/game_data_packager/__init__.py index b072457..5e1818f 100644 --- a/lib/game_data_packager/__init__.py +++ b/lib/game_data_packager/__init__.py @@ -1657,18 +1657,21 @@ class GameData(object): self.argument_parser = parser return parser - def look_for_files(self, paths=(), search=True): + def look_for_files(self, paths=(), search=True, packages=None): paths = list(paths) if self.save_downloads is not None: paths.append(self.save_downloads) + if packages is None: + packages = self.packages.values() + if search: for path in self.try_repack_from: if os.path.isdir(path): paths.append(path) - for package in self.packages.values(): + for package in packages: path = '/' + package.install_to if os.path.isdir(path): paths.append(path) @@ -1697,8 +1700,6 @@ class GameData(object): self.save_downloads = args.save_downloads - self.look_for_files(paths=args.paths, search=args.search) - if args.shortname in self.packages: if args.packages and args.packages != [args.shortname]: not_the_one = [p for p in args.packages if p != args.shortname] @@ -1723,6 +1724,9 @@ class GameData(object): # a demo if we have its corresponding full game packages = set(self.packages.values()) + self.look_for_files(paths=args.paths, search=args.search, + packages=packages) + try: ready = self.prepare_packages(packages, build_demos=args.demo, download=args.download) @@ -1869,7 +1873,10 @@ class GameData(object): subprocess.call(['su', '-c', cmd]) - def iter_steam_paths(self): + def iter_steam_paths(self, packages=None): + if packages is None: + packages = self.packages.values() + for prefix in ( os.path.expanduser('~/.steam'), os.path.join(os.environ.get('XDG_DATA_HOME', os.path.expanduser('~/.local/share')), @@ -1892,7 +1899,7 @@ class GameData(object): self.shortname, path) yield path - for package in self.packages.values(): + for package in packages: suffix = package.steam.get('path') if suffix is not None: -- 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
