Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 08:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

ack-sync, dgetlp, grab-merge, syncpackage: Export DEB_VENDOR=Ubuntu when

Browse Source 
unpacking source packages. 3.0 (quilt) has optional per-vendor patch
series.
This commit is contained in:
Stefano Rivera 2010-11-24 21:06:23 +02:00
parent d28b99753e
commit df87493df5
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ack-sync
View File

@ -251,7 +251,9 @@ def main(bug_numbers, all_package, all_version, all_section, update,
upload = True upload = True
# extract source # extract source
subprocess.check_call(["dpkg-source", "-x", dsc_file]) env = os.environ
env['DEB_VENDOR'] = 'Ubuntu'
subprocess.check_call(["dpkg-source", "-x", dsc_file], env=env)
build_source(dist, dsc_file) build_source(dist, dsc_file)

5
debian/changelog vendored
View File

@ -7,8 +7,11 @@ ubuntu-dev-tools (0.107) UNRELEASED; urgency=low
- Sort debian/install as well as debian/*.install - Sort debian/install as well as debian/*.install
- Add one-space-indentation option: --short-indent - Add one-space-indentation option: --short-indent
- Remove null-entry from trailing comma in sorted lists - Remove null-entry from trailing comma in sorted lists
* ack-sync, dgetlp, grab-merge, syncpackage: Export DEB_VENDOR=Ubuntu when
unpacking source packages. 3.0 (quilt) has optional per-vendor patch
series.
-- Stefano Rivera <stefanor@ubuntu.com> Wed, 24 Nov 2010 20:02:21 +0200 -- Stefano Rivera <stefanor@ubuntu.com> Wed, 24 Nov 2010 21:04:46 +0200
ubuntu-dev-tools (0.106) experimental; urgency=low ubuntu-dev-tools (0.106) experimental; urgency=low

5
dgetlp
View File

@ -221,9 +221,12 @@ 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.call(unpack_cmd.split(), stdout=out, stderr=err) ret = subprocess.Popen(unpack_cmd.split(), stdout=out, stderr=err, env=env)
out.close() out.close()
err.close() err.close()
if ret: if ret:

2
grab-merge
View File

@ -80,7 +80,7 @@ echo
if grep "^generated: " REPORT >/dev/null; then if grep "^generated: " REPORT >/dev/null; then
VERSION=$(sed -n -e "/^generated:/s/^generated: *//p" REPORT) VERSION=$(sed -n -e "/^generated:/s/^generated: *//p" REPORT)
dpkg-source -x ${MERGE}_${VERSION#*:}.dsc DEB_VENDOR=Ubuntu dpkg-source -x ${MERGE}_${VERSION#*:}.dsc
echo echo
else else
TARBALL=$(sed -n -e "/\.src\.tar\.gz$/p" REPORT) TARBALL=$(sed -n -e "/\.src\.tar\.gz$/p" REPORT)

4
syncpackage
View File

@ -275,11 +275,13 @@ def sync_dsc(script_name, dscurl, debian_dist, release, name, email, bugs,
# extract package # extract package
cmd = ['dpkg-source', '-x', dscname] cmd = ['dpkg-source', '-x', dscname]
env = os.environ
env['DEB_VENDOR'] = 'Ubuntu'
if not verbose: if not verbose:
cmd.insert(1, "-q") cmd.insert(1, "-q")
if verbose: if verbose:
print_command(script_name, cmd) print_command(script_name, cmd)
subprocess.check_call(cmd) subprocess.check_call(cmd, env=env)
# Do a fake sync if required # Do a fake sync if required
if len(fakesync_files) > 0: if len(fakesync_files) > 0: