Selaa lähdekoodia

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

SVN-Revision: 19085
Michael Büsch 16 vuotta sitten
vanhempi
sitoutus
ff6010a732
1 muutettua tiedostoa jossa 3 lisäystä ja 7 poistoa
  1. 3 7
      scripts/dl_cleanup.py

+ 3 - 7
scripts/dl_cleanup.py

@@ -11,8 +11,6 @@ import os
 import re
 import re
 import getopt
 import getopt
 
 
-DEBUG = 0
-
 # Commandline options
 # Commandline options
 opt_dryrun = False
 opt_dryrun = False
 
 
@@ -94,7 +92,7 @@ blacklist = [
 	(".fw",			re.compile(r".*\.fw")),
 	(".fw",			re.compile(r".*\.fw")),
 	(".arm",		re.compile(r".*\.arm")),
 	(".arm",		re.compile(r".*\.arm")),
 	(".bin",		re.compile(r".*\.bin")),
 	(".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)]
 				filename = filename[0:0-len(ext)]
 				break
 				break
 		else:
 		else:
-			if DEBUG:
-				print "Extension did not match on", filename
+			print self.filename, "has an unknown file-extension"
 			raise EntryParseError("ext")
 			raise EntryParseError("ext")
 		for (regex, parseVersion) in versionRegex:
 		for (regex, parseVersion) in versionRegex:
 			match = regex.match(filename)
 			match = regex.match(filename)
@@ -119,8 +116,7 @@ class Entry:
 				(self.progname, self.version) = parseVersion(match)
 				(self.progname, self.version) = parseVersion(match)
 				break
 				break
 		else:
 		else:
-			if DEBUG:
-				print "Version regex did not match on", filename
+			print self.filename, "has an unknown version pattern"
 			raise EntryParseError("ver")
 			raise EntryParseError("ver")
 
 
 	def deleteFile(self):
 	def deleteFile(self):