summaryrefslogtreecommitdiffstats
path: root/functions
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-08-19 14:34:07 (GMT)
committerColin Watson <cjwatson@debian.org>2014-08-19 14:34:07 (GMT)
commit11b004e9e2bb6e0767700f92559ed2d6f7e028d9 (patch)
treecca14ebc4a9ddb80a69223238484309bd6b2345a /functions
parent943d822ed4623ddfbdbcc329a3ff3831c6a0a2aa (diff)
downloaddebootstrap-11b004e9e2bb6e0767700f92559ed2d6f7e028d9.zip
debootstrap-11b004e9e2bb6e0767700f92559ed2d6f7e028d9.tar.gz
debootstrap-11b004e9e2bb6e0767700f92559ed2d6f7e028d9.tar.bz2
Fix "possibly the package $pkg is at fault" warnings to account for changed error output in dpkg 1.17.2.
Diffstat (limited to 'functions')
-rw-r--r--functions2
1 files changed, 1 insertions, 1 deletions
diff --git a/functions b/functions
index 0d48390..c100fe2 100644
--- a/functions
+++ b/functions
@@ -908,7 +908,7 @@ in_target_failmsg () {
msg="See %s for details"
if [ -e "$TARGET/debootstrap/debootstrap.log" ]; then
arg="$TARGET/debootstrap/debootstrap.log"
- local pkg="$(grep '^dpkg: error processing ' "$TARGET/debootstrap/debootstrap.log" | head -n 1 | cut -d ' ' -f 4)"
+ local pkg="$(grep '^dpkg: error processing ' "$TARGET/debootstrap/debootstrap.log" | head -n 1 | sed 's/\(error processing \)\(package \|archive \)/\1/' | cut -d ' ' -f 4)"
if [ -n "$pkg" ]; then
msg="$msg (possibly the package $pkg is at fault)"
fi