Merge lp:~vorlon/ubuntu-archive-tools/kernel-sru-review-simplify into lp:ubuntu-archive-tools

[Steve Langasek]

[Łukasz Zemczak (sil2100)]

Right! Now that we split tarball caching into two options: tarball cache directory to use and switch if new tarballs should be cached or not, it makes sense to just drop those unnecessary checks now. +1

review: Approve

=== modified file 'kernel-sru-review'
--- kernel-sru-review	2017-07-11 09:42:43 +0000
+++ kernel-sru-review	2017-07-11 16:02:01 +0000
@@ -70,48 +70,45 @@
 def fetch_tarball_from_cache(directory, tardir, source, version, cwd):
     actual_tardir = None
     tarballs = []
-    # if a tarball directory is given, try to find the tarball there
-    if tardir:
-        glob_pattern = '%s_%s.orig.tar.*' % (source, version)
-        # first we look in the current working directory where the command was
-        # called from
-        actual_tardir = cwd
-        tarballs = glob.glob(os.path.join(cwd, glob_pattern))
-        if not tarballs:
-            actual_tardir = tardir
-            tarballs = glob.glob(os.path.join(tardir, glob_pattern))
-        if tarballs:
-            target = os.path.join(directory, os.path.basename(tarballs[0]))
-            try:
-                os.link(tarballs[0], target)
-            except FileExistsError:
-                pass
-            except:
-                # if the hard linking fails, do a copy operation
-                shutil.copy(tarballs[0], target)
-        else:
-            actual_tardir = None
+
+    glob_pattern = '%s_%s.orig.tar.*' % (source, version)
+    # first we look in the current working directory where the command was
+    # called from
+    actual_tardir = cwd
+    tarballs = glob.glob(os.path.join(cwd, glob_pattern))
+    if not tarballs:
+        actual_tardir = tardir
+        tarballs = glob.glob(os.path.join(tardir, glob_pattern))
+    if tarballs:
+        target = os.path.join(directory, os.path.basename(tarballs[0]))
+        try:
+            os.link(tarballs[0], target)
+        except FileExistsError:
+            pass
+        except:
+            # if the hard linking fails, do a copy operation
+            shutil.copy(tarballs[0], target)
+    else:
+        actual_tardir = None
     return actual_tardir
 
 
 def save_tarball_to_cache(directory, tardir, source, version):
-    # if we use a tarball directory and downloaded a new tarball, copy it over
-    if tardir:
-        glob_pattern = '%s_%s.orig.tar.*' % (source, version)
-        to_copy = glob.glob(os.path.join(directory, glob_pattern))
-        for tarball in to_copy:
-            target = os.path.join(tardir, os.path.basename(tarball))
-            try:
-                os.link(tarball, target)
-            except FileExistsError:
-                pass
-            except:
-                # if the hard linking fails, do a copy operation
-                shutil.copy(tarball, target)
+    glob_pattern = '%s_%s.orig.tar.*' % (source, version)
+    to_copy = glob.glob(os.path.join(directory, glob_pattern))
+    for tarball in to_copy:
+        target = os.path.join(tardir, os.path.basename(tarball))
+        try:
+            os.link(tarball, target)
+        except FileExistsError:
+            pass
+        except:
+            # if the hard linking fails, do a copy operation
+            shutil.copy(tarball, target)
 
 
 def process_source_package(source, release, archive, ppa, ubuntu,
-                           start_dir, work_dir, tardir=None, tar_cache=False):
+                           start_dir, work_dir, tardir, tar_cache=False):
     series = ubuntu.getSeries(name_or_version=release)
 
     ppa_src = ppa.getPublishedSources(order_by_date=True,
@@ -261,14 +258,11 @@
     if len(bugs) < 1:
         parser.error('Need to specify at least one bug number')
 
-    if opts.tardir:
-        tardir = os.path.abspath(opts.tardir)
-    else:
-        tardir = None
+    tardir = os.path.abspath(opts.tardir)
 
     if opts.caching:
         # if we enabled tarball caching, make sure the tarball directory exists
-        if tardir and not os.path.isdir(tardir):
+        if not os.path.isdir(tardir):
             try:
                 os.makedirs(tardir)
             except: