From bada8f9c8b2d2387513761f1de7d55a5567f634e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20G=2E=20Aragoneses?= Date: Tue, 30 Jun 2015 02:59:27 +0200 Subject: [PATCH] [package] fix regression about patch downloading There are some packages which contain patches in the sources which need to be retrieved before being applied. Recent refactoring introduced this bogus call to self.rm() which would remove the workspace of a package before trying to download the second source (the workspace is at this point very important because we have already used tar to extract what we downloaded in the first source). --- bockbuild/package.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/bockbuild/package.py b/bockbuild/package.py index b077693..edf418d 100644 --- a/bockbuild/package.py +++ b/bockbuild/package.py @@ -225,9 +225,6 @@ def get_git_cache_path (): def checkout_archive (archive, cache, workspace): self.pushd (build_root) if not os.path.exists (cache): - # since this is a fresh cache, the workspace copy is invalid if it exists - if os.path.exists (workspace): - self.rm (workspace) progress ('Downloading: %s' % archive) filename, message = FancyURLopener ().retrieve (archive, cache) if not os.path.exists (workspace):