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

Update sponsor-patch to use the new API resulting from this change

Browse Source 
(LP: #1002999)
This commit is contained in:
Stefano Rivera 2012-05-25 12:15:33 +01:00
parent c759e49570
commit 93fbe4c71c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -21,6 +21,8 @@ ubuntu-dev-tools (0.142) UNRELEASED; urgency=low
(LP: #888736) (LP: #888736)
* backportpackage: Allow unsigned backports (LP: #992739) * backportpackage: Allow unsigned backports (LP: #992739)
* update-maintainer: Add a function to restore the original maintainer. * update-maintainer: Add a function to restore the original maintainer.
- Update sponsor-patch to use the new API resulting from this change
(LP: #1002999)
* submittodebian: Revert Ubuntu Maintainer mangling, and re-build the source * submittodebian: Revert Ubuntu Maintainer mangling, and re-build the source
package before diffing. (LP: #902233) package before diffing. (LP: #902233)

9
ubuntutools/sponsor_patch/sponsor_patch.py
View File

@ -27,7 +27,8 @@ from distro_info import UbuntuDistroInfo
from launchpadlib.launchpad import Launchpad from launchpadlib.launchpad import Launchpad
from ubuntutools import subprocess from ubuntutools import subprocess
from ubuntutools.update_maintainer import update_maintainer from ubuntutools.update_maintainer import (update_maintainer,
MaintainerUpdateException)
from ubuntutools.question import input_number from ubuntutools.question import input_number
from ubuntutools.sponsor_patch.bugtask import BugTask, is_sync from ubuntutools.sponsor_patch.bugtask import BugTask, is_sync
@ -239,8 +240,10 @@ def _create_and_change_into(workdir):
def _update_maintainer_field(): def _update_maintainer_field():
"""Update the Maintainer field in debian/control.""" """Update the Maintainer field in debian/control."""
Logger.command(["update-maintainer"]) Logger.command(["update-maintainer"])
if update_maintainer("debian", Logger.verbose) != 0: try:
Logger.error("update-maintainer script failed.") update_maintainer("debian", Logger.verbose)
except MaintainerUpdateException, e:
Logger.error("update-maintainer failed: %s", str(e))
sys.exit(1) sys.exit(1)
def _update_timestamp(): def _update_timestamp():