diff options
| author | Guido Günther <agx@sigxcpu.org> | 2013-06-26 19:14:32 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2013-06-26 21:23:09 +0200 |
| commit | b59818d0f27e365c195375cea0ed4e7ee252abb1 (patch) | |
| tree | 6846aa975c36c9d95c8835f7bc446fc129f54e93 | |
| parent | 38d43b4f0c292d28c511a9968008a500b8565768 (diff) | |
import-dsc: print filename instead of object name
| -rw-r--r-- | gbp/scripts/import_dscs.py | 6 | ||||
| -rw-r--r-- | 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 1258c7fa..28413faf 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 9482ea8d..ba3d5f79 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): |