Merge ubuntu-security-tools:allow-skipping-downloaded into ubuntu-security-tools:master

[Mark Esler]

allows previously downloaded packages and adds umt like parameters

[Mark Esler (eslerm)]

If a release is already downloaded `out` will be set to ~`ERROR: Package directory '<package>' exists. Skipping.`

[Seth Arnold (seth-arnold)]

Oh hey this "skipping" change may make it easier to re-run uaudit when it goes wrong; I've just been removing the whole directory again because I'm very lazy, but this looks even lazier! nice.

Thanks

review: Approve

diff --git a/audits/uaudit b/audits/uaudit
index 75e9594..0f8eeb5 100755
--- a/audits/uaudit
+++ b/audits/uaudit
@@ -454,8 +454,9 @@ def download(package, release, proposed=False):
         prog.insert(2, '-p')
     rc, out = cmd(prog)
     msg(out)
-    if rc != 0 or "Skipping" in out:
-        error("Problem downloading package")
+    if rc != 0:
+        if "Skipping" not in out:
+            error("Problem downloading package")
     # This is probably not good enough
     d = glob.glob(os.path.join(package, release, "%s-*" % package))[0]
     msg("Unpacked source: %s" % os.path.join(os.getcwd(), d))
@@ -1013,7 +1014,7 @@ if __name__ == "__main__":
                       default=None,
                       metavar="SBUILD_DEP_RESOLVER",
                       help="specify sbuild-dep-resolver for umt binary to use")
-    parser.add_option("--download-release",
+    parser.add_option("-r", "--download-release",
                       dest="download_release",
                       default=None,
                       metavar="RELEASE",
@@ -1028,7 +1029,7 @@ if __name__ == "__main__":
                       default=False,
                       help="build with --force-updates",
                       action='store_true')
-    parser.add_option("--force-build",
+    parser.add_option("-f", "--force-build",
                       default=False,
                       help="Disable umt checks and force build",
                       action='store_true')