From 0713ff4f94642724e94998faac1d868dd9974be4 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Wed, 8 Feb 2012 01:05:15 +0200 Subject: [PATCH] pbuilder-dist: Export DISTRIBUTION and ARCHITECTURE as well as DIST and ARCH. (Closes: #659060, LP: #423609) --- debian/changelog | 2 ++ pbuilder-dist | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index f91901b..36317de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ ubuntu-dev-tools (0.139) UNRELEASED; urgency=low * sponsor-patch: Determine the task from the UDD branch. * Re-add dgetlp. Still needed for downloading source packages from +queue. (LP: #919805) + * pbuilder-dist: Export DISTRIBUTION and ARCHITECTURE as well as DIST and + ARCH. (Closes: #659060, LP: #423609) -- Stefano Rivera Fri, 23 Dec 2011 22:33:17 +0200 diff --git a/pbuilder-dist b/pbuilder-dist index 6886ee9..96e5f35 100755 --- a/pbuilder-dist +++ b/pbuilder-dist @@ -340,11 +340,14 @@ class PbuilderDist: # Export the distribution and architecture information to the # environment so that it is accessible to ~/.pbuilderrc (LP: #628933). + # With both common variable name schemes (BTS: #659060). return [ self.auth, 'HOME=' + os.path.expanduser('~'), 'ARCHITECTURE=' + self.build_architecture, 'DISTRIBUTION=' + self.target_distro, + 'ARCH=' + self.build_architecture, + 'DIST=' + self.target_distro, self.builder, ] + arguments