diff options
author | Guido Günther <agx@sigxcpu.org> | 2011-07-24 14:16:57 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2011-07-24 14:32:38 +0200 |
commit | 5d2c1cbfb426af0f048eede4025349ce0dab6a9b (patch) | |
tree | 8bfa9e376a547f27eb463884baf8ddc8c1d2434c /git-import-orig | |
parent | 7b1f34c1f1d3315b2449d1a7e5fe9560301a0252 (diff) |
git-import-orig: simplify uscan code
Git-Dch: Ignore
Diffstat (limited to 'git-import-orig')
-rwxr-xr-x | git-import-orig | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/git-import-orig b/git-import-orig index 7625d08..9433f4b 100755 --- a/git-import-orig +++ b/git-import-orig @@ -265,14 +265,15 @@ def main(argv): except KeyError: raise GbpError, "error running uscan - debug by running uscan --verbose" - if not status and not tarball: + if status: + if tarball: + gbp.log.info("using %s" % tarball) + args.append(tarball) + else: + raise GbpError, "uscan didn't download anything, and no tarball was found in ../" + else: gbp.log.info("package is up to date, nothing to do.") return 0 - elif status and not tarball: - raise GbpError, "uscan didn't download anything, and no tarball was found in ../" - elif status and tarball: - gbp.log.info("using %s" % tarball) - args.append(tarball) # tarball specified if len(args) != 1: |