X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Farchive.py;h=410e9cabd7eabbcdc2d2ac243ed45faf0edc088f;hb=f601bd71e61c6c265b5fa1f296a5258385e6f154;hp=81719a8731871ef2a4e24903328f518d80774f57;hpb=d0e97f0b0f1a35690a7bd789e70e04d5da616efd;p=dak.git diff --git a/daklib/archive.py b/daklib/archive.py index 81719a87..410e9cab 100644 --- a/daklib/archive.py +++ b/daklib/archive.py @@ -1061,14 +1061,26 @@ class ArchiveUpload(object): remaining = [] for f in byhand: - parts = f.filename.split('_', 2) - if len(parts) != 3: - print "W: unexpected byhand filename {0}. No automatic processing.".format(f.filename) - remaining.append(f) - continue + if '_' in f.filename: + parts = f.filename.split('_', 2) + if len(parts) != 3: + print "W: unexpected byhand filename {0}. No automatic processing.".format(f.filename) + remaining.append(f) + continue + + package, version, archext = parts + arch, ext = archext.split('.', 1) + else: + parts = f.filename.split('.') + if len(parts) < 2: + print "W: unexpected byhand filename {0}. No automatic processing.".format(f.filename) + remaining.append(f) + continue - package, version, archext = parts - arch, ext = archext.split('.', 1) + package = parts[0] + version = '0' + arch = 'all' + ext = parts[-1] try: rule = automatic_byhand_packages.subtree(package)