[game-data-packager] 39/39: Fix propagation of output directory into YAML .deb-building

[Simon McVittie]

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 600e176842245af9c86a9514b79cd223fcca8927
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Jan 11 01:42:17 2015 +0000

    Fix propagation of output directory into YAML .deb-building
---
 lib/game_data_packager/__init__.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/game_data_packager/__init__.py b/lib/game_data_packager/__init__.py
index a9aefc0..373af28 100644
--- a/lib/game_data_packager/__init__.py
+++ b/lib/game_data_packager/__init__.py
@@ -1116,7 +1116,7 @@ class GameData(object):
 
         return parser
 
-    def run_command_line(self, args, outdir=''):
+    def run_command_line(self, args):
         logger.debug('package description:\n%s',
                 yaml.safe_dump(self.to_yaml()))
 
@@ -1223,8 +1223,9 @@ class GameData(object):
 
             deb_basename = '%s_%s_all.deb' % (package.name, package.version)
 
-            if outdir:
-                outfile = os.path.join(os.path.abspath(outdir), deb_basename)
+            if args.destination is not None:
+                outfile = os.path.join(os.path.abspath(args.destination),
+                        deb_basename)
             else:
                 outfile = os.path.join(self.get_workdir(), deb_basename)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git