Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-20 13:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert DEB_VENDOR exporting in pull-lp-source, dgetlp

Browse Source
This commit is contained in:
Stefano Rivera 2010-11-27 18:40:41 +02:00
parent cb64c34c22
commit 0dd7a86948
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -11,16 +11,15 @@ ubuntu-dev-tools (0.107) UNRELEASED; urgency=low
- Add configurable debian directory location - Add configurable debian directory location
- Sort Architecture (LP: #681131) - Sort Architecture (LP: #681131)
- Add --sort-binary-packages and --keep-first (LP: #681119) - Add --sort-binary-packages and --keep-first (LP: #681119)
* dgetlp, grab-merge, pull-lp-source, syncpackage: Export DEB_VENDOR=Ubuntu * grab-merge, syncpackage: Export DEB_VENDOR=Ubuntu when unpacking source
when unpacking source packages. 3.0 (quilt) has optional per-vendor patch packages. 3.0 (quilt) has optional per-vendor patch series.
series.
[ Benjamin Drung ] [ Benjamin Drung ]
* wrap-and-sort: Remove duplicate items from sorted lists. * wrap-and-sort: Remove duplicate items from sorted lists.
* syncpackage: Fix error message for failed downloads. * syncpackage: Fix error message for failed downloads.
* sponsor-patch: Support building with sbuild (LP: #681242). * sponsor-patch: Support building with sbuild (LP: #681242).
-- Stefano Rivera <stefanor@ubuntu.com> Sat, 27 Nov 2010 09:22:03 +0200 -- Stefano Rivera <stefanor@ubuntu.com> Sat, 27 Nov 2010 18:38:32 +0200
ubuntu-dev-tools (0.106) experimental; urgency=low ubuntu-dev-tools (0.106) experimental; urgency=low

5
dgetlp
View File

@ -221,12 +221,9 @@ def Download(dscinfo, number, filename, verify=True):
error(107, "Error: %s", e) error(107, "Error: %s", e)
def unpack(): def unpack():
# Source format 3.0 can apply patches based on vendor
env = os.environ
env['DEB_VENDOR'] = 'Ubuntu'
out = open('/dev/null', 'w') out = open('/dev/null', 'w')
err = 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() out.close()
err.close() err.close()
if ret: if ret:

5
pull-lp-source
View File

@ -75,13 +75,10 @@ if __name__ == '__main__':
dsc_url = [url for url in spph.sourceFileUrls() if url.endswith('.dsc')] dsc_url = [url for url in spph.sourceFileUrls() if url.endswith('.dsc')]
assert dsc_url, 'No .dsc file found' assert dsc_url, 'No .dsc file found'
env = os.environ
env['DEB_VENDOR'] = 'Ubuntu'
# All good - start downloading... # All good - start downloading...
print 'Fetching the source for %s from %s (%s)...' % ( print 'Fetching the source for %s from %s (%s)...' % (
package, release.capitalize(), pocket) 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!' print 'Success!'
else: else:
print 'Failed to fetch and extrace the source.', \ print 'Failed to fetch and extrace the source.', \