urlscm: remove downloaded files on ATTIC move

Delete the download directory if the scm-workspace is moved to attic.

Author: rhubert

pym/bob/builder.py

@@ -1209,6 +1209,8 @@ async def _cookCheckoutStep(self, checkoutStep, depth):
                                 os.makedirs(atticPath)
                             atticPath = os.path.join(atticPath, atticName)
                             os.rename(scmPath, atticPath)
+                            if scmDir in scmMap:
+                                scmMap[scmDir].postAttic(prettySrcPath)
                             BobState().setAtticDirectoryState(atticPath, scmSpec)
                             atticPaths.add(scmPath, atticPath)
                         del oldCheckoutState[scmDir]

pym/bob/scm/scm.py

@@ -361,6 +361,9 @@ def calcLiveBuildId(self, workspacePath):
         """Calculate live build-id from workspace."""
         return None
 
+    def postAttic(self, workspace):
+        pass
+
 class ScmAudit(metaclass=ABCMeta):
     @classmethod
     async def fromDir(cls, workspace, dir, extra):

pym/bob/scm/url.py

@@ -788,6 +788,11 @@ def __getExtractor(self):
             raise ParseError("Invalid extract mode: " + self.__extract)
         return extractor
 
+    def postAttic(self, workspace):
+        if self.__separateDownload:
+            downloadDestination = os.path.abspath(os.path.join(workspace, "..", "download", self.__dir))
+            if os.path.exists(downloadDestination):
+                shutil.rmtree(downloadDestination)
 
 class UrlAudit(ScmAudit):
 

test/black-box/url-scm-switch/config.yaml

@@ -1 +1 @@
-bobMinimumVersion: "0.17.3.dev82"
+bobMinimumVersion: "0.25.1.dev32"

test/black-box/url-scm-switch/run.sh

@@ -6,9 +6,15 @@
 . ../../test-lib.sh 2>/dev/null || { echo "Must run in script directory!" ; exit 1 ; }
 cleanup
 
+tempdir=$(mktemp -d)
+trap 'rm -rf "${tempdir}"' EXIT
+
 url="$(mangle_path "$(realpath file.txt)")"
 url2="$(mangle_path "$(realpath file2.txt)")"
 
+tar -cvzf $tempdir/file.tgz file.txt
+tar -cvzf $tempdir/file2.tgz file2.txt
+
 # Build and fetch result path
 run_bob dev root -DURL="$url"
 path=$(run_bob query-path -DURL="$url" -f {src} root)
@@ -36,3 +42,11 @@ run_bob dev root -DURL="$url2"
 expect_not_exist  "$path/file.txt"
 expect_not_exist  "$path/canary.txt"
 diff -q "$path/file2.txt" file2.txt
+
+cleanup
+run_bob dev root -DURL="$tempdir/file.tgz"
+expect_exist $path/../download/file.tgz
+
+run_bob dev root -DURL="$tempdir/file2.tgz"
+expect_exist $path/../download/file2.tgz
+expect_not_exist $path/../download/file.tgz