X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=inline;f=scripts%2Fdl_cleanup.py;h=c2bbbc25bb5d7b35335ae0871edac76332c0482d;hb=8411858194dbc037d1747359f6fd8bc78258e666;hp=81c69f7aa512ff893ac0fb17dcac9cb42d38d015;hpb=1460115836fe21d61c7357ff69498aae34bd0e9d;p=oweals%2Fopenwrt.git

diff --git a/scripts/dl_cleanup.py b/scripts/dl_cleanup.py
index 81c69f7aa5..c2bbbc25bb 100755
--- a/scripts/dl_cleanup.py
+++ b/scripts/dl_cleanup.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 """
-# OpenWRT download directory cleanup utility.
+# OpenWrt download directory cleanup utility.
 # Delete all but the very last version of the program tarballs.
 #
-# Copyright (c) 2010 Michael Buesch <mb@bu3sch.de>
+# Copyright (C) 2010 Michael Buesch <mb@bu3sch.de>
+# Copyright (C) 2013 OpenWrt.org
 """
 
 import sys
@@ -75,17 +76,20 @@ def parseVer_GIT(match, filepath):
 extensions = (
 	".tar.gz",
 	".tar.bz2",
+	".tar.xz",
 	".orig.tar.gz",
 	".orig.tar.bz2",
+	".orig.tar.xz",
 	".zip",
 	".tgz",
 	".tbz",
+	".txz",
 )
 
 versionRegex = (
-	(re.compile(r"(.+)[-_]([0-9a-fA-F]{40,40})"), parseVer_GIT),		# xxx-GIT_SHASUM
 	(re.compile(r"(.+)[-_](\d+)\.(\d+)\.(\d+)\.(\d+)"), parseVer_1234),	# xxx-1.2.3.4
 	(re.compile(r"(.+)[-_](\d\d\d\d)-?(\d\d)-?(\d\d)"), parseVer_ymd),	# xxx-YYYY-MM-DD
+	(re.compile(r"(.+)[-_]([0-9a-fA-F]{40,40})"), parseVer_GIT),		# xxx-GIT_SHASUM
 	(re.compile(r"(.+)[-_](\d+)\.(\d+)\.(\d+)(\w?)"), parseVer_123),	# xxx-1.2.3a
 	(re.compile(r"(.+)[-_](\d+)_(\d+)_(\d+)"), parseVer_123),		# xxx-1_2_3
 	(re.compile(r"(.+)[-_](\d+)\.(\d+)(\w?)"), parseVer_12),		# xxx-1.2a
@@ -142,7 +146,7 @@ class Entry:
 		return self.version >= y.version
 
 def usage():
-	print "OpenWRT download directory cleanup utility"
+	print "OpenWrt download directory cleanup utility"
 	print "Usage: " + sys.argv[0] + " [OPTIONS] <path/to/dl>"
 	print ""
 	print " -d|--dry-run            Do a dry-run. Don't delete any files"