Commit e99ef5b6 authored by Luca Falavigna's avatar Luca Falavigna

Merge tag '1.0.92' into stretch-backports

parents 7c09e35e ed04696d
debootstrap (1.0.92) unstable; urgency=medium
* Team upload.
* Add (Ubuntu) bionic as a symlink to gutsy.
* Bump Standards-Version to 4.1.1:
+ Priority:extra is deprecated, change to optional.
-- Mattia Rizzolo <mattia@debian.org> Fri, 27 Oct 2017 17:05:39 +0200
debootstrap (1.0.91) unstable; urgency=medium
[ Sven Joachim ]
* Avoid the 'type' shell command (closes: #860545).
-- Christian Perrier <bubulle@debian.org> Wed, 26 Jul 2017 06:53:10 +0200
debootstrap (1.0.90~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
......
Source: debootstrap
Section: admin
Priority: extra
Priority: optional
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Uploaders: Junichi Uekawa <dancer@debian.org>, Colin Watson <cjwatson@debian.org>, Christian Perrier <bubulle@debian.org>, Steve McIntyre <93sam@debian.org>
Build-Depends: debhelper (>= 9)
Standards-Version: 3.9.8
Standards-Version: 4.1.1
Vcs-Browser: https://anonscm.debian.org/cgit/d-i/debootstrap.git
Vcs-Git: https://anonscm.debian.org/git/d-i/debootstrap.git
......
[buildpackage]
debian-tag = %(version)s
......@@ -231,7 +231,7 @@ if [ $# != 0 ] ; then
error 1 NEEDARG "option requires an argument %s" "$1"
fi
if valid_extractor "$EXTRACTOR_OVERRIDE"; then
if ! type "$EXTRACTOR_OVERRIDE" >/dev/null 2>&1; then
if ! in_path "$EXTRACTOR_OVERRIDE"; then
error 1 MISSINGEXTRACTOR "The selected extractor cannot be found: %s" "$EXTRACTOR_OVERRIDE"
fi
else
......
......@@ -899,7 +899,7 @@ extract_ar_deb_field () {
*) error 1 UNKNOWNCONTROLCOMP "Unknown compression type for %s in %s" "$tarball" "$pkg" ;;
esac
if type $cat_cmd >/dev/null 2>&1; then
if in_path $cat_cmd; then
ar -p "$pkg" "$tarball" | $cat_cmd |
tar -O -xf - control ./control 2>/dev/null |
grep -i "^$field:" | sed -e 's/[^:]*: *//' | head -n 1
......@@ -920,7 +920,7 @@ extract_ar_deb_data () {
*) error 1 UNKNOWNDATACOMP "Unknown compression type for %s in %s" "$tarball" "$pkg" ;;
esac
if type $cat_cmd >/dev/null 2>&1; then
if in_path $cat_cmd; then
ar -p "$pkg" "$tarball" | $cat_cmd | tar $EXTRACT_DEB_TAR_OPTIONS -xf -
else
error 1 UNPACKCMDUNVL "Extracting %s requires the %s command, which is not available" "$pkg" "$cat_cmd"
......@@ -944,7 +944,7 @@ choose_extractor () {
if [ -n "$EXTRACTOR_OVERRIDE" ]; then
extractor="$EXTRACTOR_OVERRIDE"
elif type dpkg-deb >/dev/null 2>&1; then
elif in_path dpkg-deb; then
extractor="dpkg-deb"
else
extractor="ar"
......
gutsy
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment