diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-01-05 21:17:30 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-01-05 23:20:10 +0000 |
commit | 2a4a723706efc5c7f520b01acc7ce211338d6bee (patch) | |
tree | 568a2ddd6a1662ad8367eb91cf8adc7bf8b6fe76 | |
parent | 07a861b637e45f33cfbb9031e6fe4061f31e929c (diff) |
dgit: Check that the build-products-dir is accessible
In fetch/clone, and build. Others are less likely to be an irritating
problem.
Closes: #913648.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | dgit | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -2197,6 +2197,12 @@ sub check_for_vendor_patches () { __ "(nominal) distro being accessed"); } +sub check_bpd_exists () { + stat $buildproductsdir + or fail f_ "build-products-dir %s is not accessible: %s\n", + $buildproductsdir, $!; +} + sub generate_commits_from_dsc () { # See big comment in fetch_from_archive, below. # See also README.dsc-import. @@ -3062,6 +3068,7 @@ END } sub fetch_from_archive () { + check_bpd_exists(); ensure_setup_existing_tree(); # Ensures that lrref() is what is actually in the archive, one way @@ -3760,6 +3767,7 @@ sub clone ($) { mkdir $dstdir or fail f_ "create \`%s': %s", $dstdir, $!; changedir $dstdir; + check_bpd_exists(); canonicalise_suite(); my $hasgit = check_for_git(); @@ -6305,6 +6313,7 @@ sub build_prep_early () { sub build_prep ($) { my ($wantsrc) = @_; build_prep_early(); + check_bpd_exists(); if (!building_source_in_playtree() || ($wantsrc & WANTSRC_BUILDER)) { # Clean the tree because we're going to use the contents of # $maindir. (We trying to include dirty changes in the source |