Revert the submittodebian change to inline patches. This is a style

choice, the patch length has nothing to do with it; if there's demand for
patch inlining, this should be made a (non-default) option to
submittodebian.
This commit is contained in:
Steve Langasek 2009-12-27 16:27:32 -08:00
parent ae7449ce54
commit fe3937b755
2 changed files with 10 additions and 9 deletions

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
ubuntu-dev-tools (0.86ubuntu1) UNRELEASED; urgency=low
* Revert the submittodebian change to inline patches. This is a style
choice, the patch length has nothing to do with it; if there's demand for
patch inlining, this should be made a (non-default) option to
submittodebian.
-- Steve Langasek <steve.langasek@ubuntu.com> Sun, 27 Dec 2009 16:24:49 -0800
ubuntu-dev-tools (0.86) lucid; urgency=low
[ Emmet Hikory ]

View File

@ -90,15 +90,7 @@ def edit_debdiff(debdiff):
run_cmd(cmd)
def submit_bugreport(body, debdiff, changelog):
# Count the number of lines in the patch
debdiff_file = open(debdiff, 'r')
n_lines = len(debdiff_file.readlines())
debdiff_file.close()
# If the patch is smaller than 51 lines, we include it inline, attach it otherwise.
inclusion_method = '--include' if n_lines < 51 else '-A'
cmd = 'reportbug -P "User: ubuntu-devel@lists.ubuntu.com" -P "Usertags: origin-ubuntu lucid ubuntu-patch" -T patch %s %s -B debian -i %s -V %s %s' % (inclusion_method, debdiff, body, deb_version, changelog.package)
cmd = 'reportbug -P "User: ubuntu-devel@lists.ubuntu.com" -P "Usertags: origin-ubuntu lucid ubuntu-patch" -T patch -A %s -B debian -i %s -V %s %s' % (debdiff, body, deb_version, changelog.package)
run_cmd(cmd)
def run_cmd(cmd):