diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2020-02-01 21:04:56 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2020-02-01 21:04:56 +0000 |
commit | ece5816db28a48e097d99da1bfaf4d853726b851 (patch) | |
tree | 33bd6360f6ca54dfb28280cec8f97aec30b5ee6c | |
parent | 524d221c7e3b70db546be01d4929a1e9a56e14b7 (diff) |
dgit: absurd: Provide a way for absurd git to print warnings
The file ../../absurd-apply-warnings is dumped to dgit's stderr.
Nothing writes to it yet, so no overall functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | absurd/git | 2 | ||||
-rwxr-xr-x | dgit | 8 |
2 files changed, 10 insertions, 0 deletions
@@ -7,6 +7,8 @@ case "$DGIT_ABSURD_DEBUG" in *) exec 3>>../../gbp-pq-output 2>&3 ;; esac +exec 4>>../../absurd-apply-warnings + log () { echo >&3 "DGIT ABSURD GIT APPLY (DEBUG) $*" echo >&2 "DGIT ABSURD GIT APPLY (STDERR) $*" @@ -36,6 +36,7 @@ use File::Path; use File::Spec; use File::Temp qw(tempdir); use File::Basename; +use File::Copy (); use Dpkg::Version; use Dpkg::Compression; use Dpkg::Compression::Process; @@ -2659,6 +2660,8 @@ END chomp $@; progress "warning: $@"; $path = "$absurdity:$path"; + open T, ">../../absurd-apply-warnings" or die $!; + close T or die $!; progress f_ "%s: trying slow absurd-git-apply...", $us; rename "../../gbp-pq-output","../../gbp-pq-output.0" or $!==ENOENT @@ -2693,6 +2696,11 @@ gbp-pq import and dpkg-source disagree! dpkg-source --before-build gave tree %s END $rawimport_hash = $gapplied; + + if ($use_absurd) { + File::Copy::copy("../../absurd-apply-warnings", \*STDERR) + or die $!; + } }; last unless $@; } |