From 26c7a76318d77eed1b9764627d73bd8978a95b45 Mon Sep 17 00:00:00 2001 From: Krytarik Raido Date: Fri, 25 Nov 2016 02:34:04 +0100 Subject: Reduce code duplication in ArchiveDir. --- mini-dinstall | 22 ++-------------------- 1 file 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): -- cgit v1.2.3