From b59818d0f27e365c195375cea0ed4e7ee252abb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Wed, 26 Jun 2013 19:14:32 +0200 Subject: import-dsc: print filename instead of object name --- gbp/scripts/import_dscs.py | 6 +++--- tests/14_test_gbp_import_dscs.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gbp/scripts/import_dscs.py b/gbp/scripts/import_dscs.py index 1258c7f..28413fa 100644 --- a/gbp/scripts/import_dscs.py +++ b/gbp/scripts/import_dscs.py @@ -42,7 +42,7 @@ class GitImportDsc(object): self.args = args def importdsc(self, dsc): - return import_dsc.main(['gbp', 'import-dsc'] + self.args + [dsc.dscfile]) + return import_dsc.main(['import-dsc'] + self.args + [dsc.dscfile]) def fetch_snapshots(pkg, downloaddir): @@ -148,12 +148,12 @@ def main(argv): dirs['pkg'] = os.path.join(dirs['top'], dscs[0].pkg) if importer.importdsc(dscs[0]): - raise GbpError("Failed to import '%s'" % dscs[0]) + raise GbpError("Failed to import '%s'" % dscs[0].dscfile) os.chdir(dirs['pkg']) for dsc in dscs[1:]: if importer.importdsc(dsc): - raise GbpError("Failed to import '%s'" % dscs[0]) + raise GbpError("Failed to import '%s'" % dscs[0].dscfile) except (GbpError, gbpc.CommandExecFailed, GitRepositoryError) as err: if len(err.__str__()): diff --git a/tests/14_test_gbp_import_dscs.py b/tests/14_test_gbp_import_dscs.py index 9482ea8..ba3d5f7 100644 --- a/tests/14_test_gbp_import_dscs.py +++ b/tests/14_test_gbp_import_dscs.py @@ -44,6 +44,7 @@ class DscStub(object): def __init__(self, filename, version): self.filename = filename self.version = version + self.dscfile = filename @classmethod def parse(cls, filename): -- cgit v1.2.1