Attachment 145496 Details for Bug 179766 – debootstrap fixes

[patch] debootstrap fixes

debootstrap-fixes.diff (text/plain), 1023 bytes, created by Nikolai Lifanov on 2014-08-08 00:50:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolai Lifanov

Created: 2014-08-08 00:50:23 UTC

Size: 1023 bytes

patch

obsolete

>Index: files/patch-debootstrap
>===================================================================
>--- files/patch-debootstrap	(revision 30161)
>+++ files/patch-debootstrap	(working copy)
>@@ -1,5 +1,5 @@
> --- ./debootstrap.orig	2014-02-07 10:25:58.000000000 -0500
>-+++ ./debootstrap	2014-08-07 15:27:50.945602780 -0400
>++++ ./debootstrap	2014-08-07 20:46:10.626600981 -0400
> @@ -13,7 +13,7 @@
>  	if [ -x /debootstrap/debootstrap ]; then
>  		DEBOOTSTRAP_DIR=/debootstrap
>@@ -9,6 +9,19 @@
>  	fi
>  fi
>  
>+@@ -399,10 +399,10 @@
>+ 
>+ if in_path dpkg && \
>+      dpkg --print-architecture >/dev/null 2>&1; then
>+-	HOST_ARCH=`/usr/bin/dpkg --print-architecture`
>++	HOST_ARCH=`%%PREFIX%%/bin/dpkg --print-architecture`
>+ elif in_path udpkg && \
>+      udpkg --print-architecture >/dev/null 2>&1; then
>+-	HOST_ARCH=`/usr/bin/udpkg --print-architecture`
>++	HOST_ARCH=`%%PREFIX%%/bin/udpkg --print-architecture`
>+ elif [ -e $DEBOOTSTRAP_DIR/arch ]; then
>+ 	HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch`
>+ fi
> @@ -425,6 +425,10 @@
>  	esac
>  fi

Flags:

lifanov: maintainer-approval+

Actions: View | Diff

Attachments on bug 179766: 135003 | 145489 | 145496 | 145497