dl_cleanup: Show it to the user, if file extension or version pattern is unknown

[openwrt/staging/yousong.git] / scripts / dl_cleanup.py

diff --git a/scripts/dl_cleanup.py b/scripts/dl_cleanup.py
index 7adc475d4da5d2812ba913843468f6b88402b2db..48f587de5274cf5e314b72b9b1544185a9fd8671 100755 (executable)
--- a/scripts/dl_cleanup.py
+++ b/scripts/dl_cleanup.py
@@ -11,8 +11,6 @@ import os
 import re
 import getopt
 
 import re
 import getopt
 

-DEBUG = 0
-

 # Commandline options
 opt_dryrun = False
 
 # Commandline options
 opt_dryrun = False
 


@@ -94,7 +92,7 @@ blacklist = [
        (".fw",                 re.compile(r".*\.fw")),
        (".arm",                re.compile(r".*\.arm")),
        (".bin",                re.compile(r".*\.bin")),
        (".fw",                 re.compile(r".*\.fw")),
        (".arm",                re.compile(r".*\.arm")),
        (".bin",                re.compile(r".*\.bin")),

-       ("rt-firmware",         re.compile(r"RT\d+_Firmware.*")),
+       ("rt-firmware",         re.compile(r"RT[\d\w]+_Firmware.*")),

 ]
 
 class EntryParseError(Exception): pass
 ]
 
 class EntryParseError(Exception): pass


@@ -110,8 +108,7 @@ class Entry:
                                filename = filename[0:0-len(ext)]
                                break
                else:
                                filename = filename[0:0-len(ext)]
                                break
                else:

-                       if DEBUG:
-                               print "Extension did not match on", filename
+                       print self.filename, "has an unknown file-extension"

                        raise EntryParseError("ext")
                for (regex, parseVersion) in versionRegex:
                        match = regex.match(filename)
                        raise EntryParseError("ext")
                for (regex, parseVersion) in versionRegex:
                        match = regex.match(filename)


@@ -119,8 +116,7 @@ class Entry:
                                (self.progname, self.version) = parseVersion(match)
                                break
                else:
                                (self.progname, self.version) = parseVersion(match)
                                break
                else:

-                       if DEBUG:
-                               print "Version regex did not match on", filename
+                       print self.filename, "has an unknown version pattern"

                        raise EntryParseError("ver")
 
        def deleteFile(self):
                        raise EntryParseError("ver")
 
        def deleteFile(self):