Merge ~nacc/git-ubuntu:lp1731513-fix-cache-symlink-to-parent-dir into git-ubuntu:master

[Nish Aravamudan]

Make jenkins happy.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:6e7088f206c8c3cdcd9d0efe2de3028711fadd4a
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/206/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    SUCCESS: Unit Tests
    SUCCESS: Integration Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/206/rebuild

review: Approve (continuous-integration)

diff --git a/gitubuntu/build.py b/gitubuntu/build.py
index 8905ccb..072d3e7 100644
--- a/gitubuntu/build.py
+++ b/gitubuntu/build.py
@@ -198,9 +198,9 @@ def _symlink_paths_into_parent_dir(paths):
     unwind_unlink_paths = []
     for path in paths:
         try:
-            old_path = _symlink_into_parent_dir(path)
-            if old_path is not None:
-                unwind_unlink_paths.append(old_path)
+            new_path = _symlink_into_parent_dir(path)
+            if new_path is not None:
+                unwind_unlink_paths.append(new_path)
         except:
             for path in unwind_unlink_paths:
                 os.unlink(path)
@@ -243,7 +243,9 @@ def fetch_orig_from_cache(changelog, source, dl_cache=None):
         )
         return None # XXX decide - see docstring
 
-    return dsc.all_tarball_paths
+    orig_paths = dsc.all_tarball_paths
+    _symlink_paths_into_parent_dir(orig_paths)
+    return orig_paths
 
 
 def fetch_orig_from_pristine_tar(changelog, source, repo):