aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunichi Uekawa <dancer@dancer64.netfort.gr.jp>2007-06-01 17:49:51 +0900
committerJunichi Uekawa <dancer@dancer64.netfort.gr.jp>2007-06-01 17:49:51 +0900
commitfa2dfbf5dd5237602cc6b0693f94d5013ecb6d4b (patch)
tree2721b4662f6f6708b8a6682efceb058568f05db0
parent57e5a2058ef7598ea657fd14fc47ad29f42ff249 (diff)
downloadpbuilder-fa2dfbf5dd5237602cc6b0693f94d5013ecb6d4b.tar
pbuilder-fa2dfbf5dd5237602cc6b0693f94d5013ecb6d4b.tar.gz
run dpkg-architecture inside chroot for pbuilder-satisfydepends-{aptitude,experimental} also.
-rw-r--r--ChangeLog5
-rw-r--r--debian/changelog4
-rwxr-xr-xpbuilder-satisfydepends-aptitude2
-rwxr-xr-xpbuilder-satisfydepends-experimental2
4 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 91e3cb4..3365fb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-01 Junichi Uekawa <dancer@debian.org>
+
+ * pbuilder-satisfydepends-aptitude:
+ * pbuilder-satisfydepends-experimental: run dpkg-architecture inside chroot.
+
2007-05-31 Junichi Uekawa <dancer@debian.org>
* pbuilder-runhooks: add documentation on usage of BUILDPLACE when
diff --git a/debian/changelog b/debian/changelog
index 93e2e39..28ab189 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ pbuilder (0.169) UNRELEASED; urgency=low
[ Junichi Uekawa ]
* pdebuild-internal now runs hooks A, B, C, and D. thanks to pusling for
reporting.
+ * run dpkg-architecture inside chroot for
+ pbuilder-satisfydepends-{aptitude,experimental} also.
- -- Junichi Uekawa <dancer@debian.org> Thu, 31 May 2007 23:46:47 +0900
+ -- Junichi Uekawa <dancer@debian.org> Fri, 01 Jun 2007 17:49:34 +0900
pbuilder (0.168) unstable; urgency=low
diff --git a/pbuilder-satisfydepends-aptitude b/pbuilder-satisfydepends-aptitude
index 5ae27e8..f7d59f4 100755
--- a/pbuilder-satisfydepends-aptitude
+++ b/pbuilder-satisfydepends-aptitude
@@ -56,7 +56,7 @@ function filter_arch_deps() {
function checkbuilddep_internal () {
# Use this function to fulfill the dependency (almost)
- local ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
+ local ARCH=$($CHROOTEXEC dpkg-architecture -qDEB_HOST_ARCH)
local BUILD_DEP_DEB_DIR
local BUILD_DEP_DEB_CONTROL
local DEPENDS
diff --git a/pbuilder-satisfydepends-experimental b/pbuilder-satisfydepends-experimental
index c0e7ca2..3fd0c5d 100755
--- a/pbuilder-satisfydepends-experimental
+++ b/pbuilder-satisfydepends-experimental
@@ -25,7 +25,7 @@ set -e
# Use this function to fulfill the dependency (almost)
function checkbuilddep_internal () {
- local ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
+ local ARCH=$($CHROOTEXEC dpkg-architecture -qDEB_HOST_ARCH)
local INSTALLPKG
local INSTALLPKGLIST
local INSTALLPKGMULTI