dl_cleanup: Show it to the user, if file extension or version pattern is unknown
authormb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sat, 9 Jan 2010 18:58:28 +0000 (18:58 +0000)
committermb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sat, 9 Jan 2010 18:58:28 +0000 (18:58 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19085 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/dl_cleanup.py

index 7adc475..48f587d 100755 (executable)
@@ -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):
This page took 0.02401 seconds and 4 git commands to generate.