Merge ~alexmurray/ubuntu-cve-tracker:fix-packages-mirror-context-handling-to-fix-source-map-cache-generation into ubuntu-cve-tracker:master

[Alex Murray]

scripts/packages-mirror: restore context to fix source map cache gen

Previously packages-mirror would cd to the "$debianPath" in some cases but would
then fail to restore the working directory - as such the resulting
gen-source-map-cache script would not be found and the source map cache would
never be generated. So use pushd/popd to avoid this rather than cd. Also whilst
debugging this it was also found that in one case packages-mirror would
overwrite the value of "$verbosity_args" and not restore it, so make sure this
is also restored to respect the users use of -v or not.

Signed-off-by: Alex Murray <email address hidden>

[Steve Beattie (sbeattie)]

Ack, thanks, pushd/popd are bashisms, but the script is already bash-specific so no harm there.

review: Approve

diff --git a/.launchpad.yaml b/.launchpad.yaml
index c3f14db..9c21a2b 100644
--- a/.launchpad.yaml
+++ b/.launchpad.yaml
@@ -61,6 +61,7 @@ jobs:
       - rsync
       - wget
     run-before: |
+      export UCT=$(pwd)
       # configure a basic ~/.ubuntu-cve-tracker.conf and setup packages-mirror
       # for source_map
       echo plb_authentication=/dev/null > ~/.ubuntu-cve-tracker.conf
diff --git a/scripts/packages-mirror b/scripts/packages-mirror
index c62eda6..fc69277 100755
--- a/scripts/packages-mirror
+++ b/scripts/packages-mirror
@@ -322,6 +322,7 @@ fi
 #
 if [ "$only_ubuntu" = "no" ]; then
     if [ -z "$very_verbose" ]; then
+        old_verbosity_args="$verbosity_args"
         verbosity_args="-q"
     fi
 
@@ -330,7 +331,7 @@ if [ "$only_ubuntu" = "no" ]; then
         # Sync Sources from Debian testing
         timestamp="${debianPath}.timestamp"
         if [ ! -e "${debianPath}/dists" ] || do_use_timestamp "$timestamp" 6 ; then
-            cd "$debianPath"
+            pushd "$debianPath" >/dev/null
             for i in main contrib non-free
             do
                 wget $verbosity_args -N -R '*=*' -R 'Contents*' -X '/debian/dists/testing/*/source/Sources.diff,/debian/dists/testing/*/source/by-hash' -np -r "http://$debian/debian/dists/testing/$i/source/"
@@ -344,8 +345,12 @@ if [ "$only_ubuntu" = "no" ]; then
             else
                 rm -f "$timestamp"
             fi
+            popd >/dev/null
         fi
     fi
+    if [ -z "$very_verbose" ]; then
+        verbosity_args="$old_verbosity_args"
+    fi
 fi
 
 # generate source package lists for umt grep