From: Andre Heider <a.heider@gmail.com>
Date: Sat, 12 Nov 2022 08:50:36 +0000 (+0100)
Subject: scripts: fix dl_cleanup.py argument handling
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9a2d362bf7296d955b3cb8ab625bf1ec25703f89;p=openwrt%2Fstaging%2Fblocktrron.git

scripts: fix dl_cleanup.py argument handling

The -w|--whitelist and -D|--download-dir arguments pass an additional value,
properly evaluate that.
Also allow to pass the download directory without -D|--download-dir, just as
the usage describes.
Finally fix spitting out the wrong error messages about those args.

Signed-off-by: Andre Heider <a.heider@gmail.com>
---

diff --git a/scripts/dl_cleanup.py b/scripts/dl_cleanup.py
index b15a9bb1a7..cdbcb83f20 100755
--- a/scripts/dl_cleanup.py
+++ b/scripts/dl_cleanup.py
@@ -224,7 +224,7 @@ def main(argv):
     try:
         (opts, args) = getopt.getopt(
             argv[1:],
-            "hdBwDb:",
+            "hdBw:D:b:",
             [
                 "help",
                 "dry-run",
@@ -268,12 +268,15 @@ def main(argv):
         if o in ("-b", "--build-dir"):
             builddir = v
 
+    if args:
+        directory = args[0]
+
     if not os.path.exists(directory):
-        print("Can't find dl path", directory)
+        print("Can't find download directory", directory)
         return 1
 
     if not os.path.exists(builddir):
-        print("Can't find dl path", builddir)
+        print("Can't find build directory", builddir)
         return 1
 
     # Create a directory listing and parse the file names.