diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | functions | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index ec4e4f0..8be279e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debootstrap (1.0.61) UNRELEASED; urgency=medium + + * Fix "possibly the package $pkg is at fault" warnings to account for + changed error output in dpkg 1.17.2. + + -- Colin Watson <cjwatson@debian.org> Tue, 19 Aug 2014 15:33:09 +0100 + debootstrap (1.0.60) unstable; urgency=medium [ Adam Conrad ] @@ -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 |