From 0dd7a8694808d7c8d771783ad1d7fda8538f24c5 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Sat, 27 Nov 2010 18:40:41 +0200 Subject: [PATCH] Revert DEB_VENDOR exporting in pull-lp-source, dgetlp --- debian/changelog | 7 +++---- dgetlp | 5 +---- pull-lp-source | 5 +---- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index cee093a..037091d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,16 +11,15 @@ ubuntu-dev-tools (0.107) UNRELEASED; urgency=low - Add configurable debian directory location - Sort Architecture (LP: #681131) - Add --sort-binary-packages and --keep-first (LP: #681119) - * dgetlp, grab-merge, pull-lp-source, syncpackage: Export DEB_VENDOR=Ubuntu - when unpacking source packages. 3.0 (quilt) has optional per-vendor patch - series. + * grab-merge, syncpackage: Export DEB_VENDOR=Ubuntu when unpacking source + packages. 3.0 (quilt) has optional per-vendor patch series. [ Benjamin Drung ] * wrap-and-sort: Remove duplicate items from sorted lists. * syncpackage: Fix error message for failed downloads. * sponsor-patch: Support building with sbuild (LP: #681242). - -- Stefano Rivera Sat, 27 Nov 2010 09:22:03 +0200 + -- Stefano Rivera Sat, 27 Nov 2010 18:38:32 +0200 ubuntu-dev-tools (0.106) experimental; urgency=low diff --git a/dgetlp b/dgetlp index 39db656..d6af8c3 100755 --- a/dgetlp +++ b/dgetlp @@ -221,12 +221,9 @@ def Download(dscinfo, number, filename, verify=True): error(107, "Error: %s", e) def unpack(): - # Source format 3.0 can apply patches based on vendor - env = os.environ - env['DEB_VENDOR'] = 'Ubuntu' out = open('/dev/null', 'w') err = open('/dev/null', 'w') - ret = subprocess.Popen(unpack_cmd.split(), stdout=out, stderr=err, env=env) + ret = subprocess.call(unpack_cmd.split(), stdout=out, stderr=err) out.close() err.close() if ret: diff --git a/pull-lp-source b/pull-lp-source index 11cc5b3..eccaf31 100755 --- a/pull-lp-source +++ b/pull-lp-source @@ -75,13 +75,10 @@ if __name__ == '__main__': dsc_url = [url for url in spph.sourceFileUrls() if url.endswith('.dsc')] assert dsc_url, 'No .dsc file found' - env = os.environ - env['DEB_VENDOR'] = 'Ubuntu' - # All good - start downloading... print 'Fetching the source for %s from %s (%s)...' % ( package, release.capitalize(), pocket) - if subprocess.call(['/usr/bin/dget', '-xu', dsc_url[0]], env=env) == 0: + if subprocess.call(['/usr/bin/dget', '-xu', dsc_url[0]]) == 0: print 'Success!' else: print 'Failed to fetch and extrace the source.', \