aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarKrytarik Raido <krytarik@tuxgarage.com>2016-11-25 02:34:04 +0100
committerLibravatarUnit 193 <unit193@ubuntu.com>2016-11-25 02:34:04 +0100
commit26c7a76318d77eed1b9764627d73bd8978a95b45 (patch)
treef44772f3c61ef2eadfcaa5e0a9b275cadcf51696
parent159f01de263d13d563e2caab646ee8f744ae6cd3 (diff)
downloadmini-dinstall-26c7a76318d77eed1b9764627d73bd8978a95b45.tar.bz2
mini-dinstall-26c7a76318d77eed1b9764627d73bd8978a95b45.tar.xz
mini-dinstall-26c7a76318d77eed1b9764627d73bd8978a95b45.tar.zst
Reduce code duplication in ArchiveDir.
-rwxr-xr-xmini-dinstall22
1 files changed, 2 insertions, 20 deletions
diff --git a/mini-dinstall b/mini-dinstall
index b7617f7..53eee6f 100755
--- a/mini-dinstall
+++ b/mini-dinstall
@@ -907,30 +907,12 @@ class ArchiveDir:
target = self._arch_target(arch, file)
newfiles.append((os.path.join(incomingdir, file), target, match.group(1), arch))
continue
- match = debsrc_diff_re.search(file)
+ match = debsrc_dsc_re.search(file) or debsrc_diff_re.search(file) \
+ or debsrc_orig_re.search(file) or debsrc_native_re.search(file)
if match:
is_sourceful = 1
target = self._source_target(file)
newfiles.append((os.path.join(incomingdir, file), target, match.group(1), 'source'))
- continue
- match = debsrc_orig_re.search(file)
- if match:
- is_sourceful = 1
- target = self._source_target(file)
- newfiles.append((os.path.join(incomingdir, file), target, match.group(1), 'source'))
- continue
- match = debsrc_native_re.search(file)
- if match:
- is_sourceful = 1
- target = self._source_target(file)
- newfiles.append((os.path.join(incomingdir, file), target, match.group(1), 'source'))
- continue
- match = debsrc_dsc_re.search(file) or debsrc_orig_re.search(file)
- if match:
- is_sourceful = 1
- target = self._source_target(file)
- newfiles.append((os.path.join(incomingdir, file), target, match.group(1), 'source'))
- continue
all_arches = {}
for arch in map(lambda x: x[3], newfiles):