git-import-orig: simplify uscan code

Git-Dch: Ignore

1 files changed, 7 insertions, 6 deletions

diff --git a/git-import-orig b/git-import-orig
index 7625d087..9433f4b1 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: