mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-05-19 12:51:29 +00:00
backportpackage: Improve upload question.
This commit is contained in:
parent
e69d243a59
commit
d635434a5e
@ -29,6 +29,7 @@ import lsb_release
|
|||||||
|
|
||||||
from ubuntutools.builder import getBuilder
|
from ubuntutools.builder import getBuilder
|
||||||
from ubuntutools.logger import Logger
|
from ubuntutools.logger import Logger
|
||||||
|
from ubuntutools.question import YesNoQuestion
|
||||||
|
|
||||||
def error(msg):
|
def error(msg):
|
||||||
Logger.error(msg)
|
Logger.error(msg)
|
||||||
@ -198,16 +199,11 @@ def do_build(workdir, package, release, bp_version, builder, update):
|
|||||||
workdir)
|
workdir)
|
||||||
|
|
||||||
def do_upload(workdir, package, bp_version, upload):
|
def do_upload(workdir, package, bp_version, upload):
|
||||||
prompt = 'Do you want to upload this to %s? [Y/n]' % upload
|
answer = YesNoQuestion().ask('Do you want to upload %s %s to %s' % \
|
||||||
while True:
|
(package, bp_version, upload), "yes")
|
||||||
answer = raw_input(prompt).strip().lower()
|
if answer == "yes":
|
||||||
if answer in ('', 'y', 'yes'):
|
changes_file = '%s_%s_source.changes' % (package, bp_version)
|
||||||
break
|
check_call(['dput', upload, changes_file], cwd=workdir)
|
||||||
elif answer in ('n', 'no'):
|
|
||||||
return
|
|
||||||
|
|
||||||
check_call(['dput', upload, '%s_%s_source.changes' % (package, bp_version)],
|
|
||||||
cwd=workdir)
|
|
||||||
|
|
||||||
|
|
||||||
def do_backport(workdir, package, dscfile, version, release, build, builder,
|
def do_backport(workdir, package, dscfile, version, release, build, builder,
|
||||||
|
@ -60,6 +60,11 @@ class Question(object):
|
|||||||
return selected
|
return selected
|
||||||
|
|
||||||
|
|
||||||
|
class YesNoQuestion(Question):
|
||||||
|
def __init__(self):
|
||||||
|
Question.__init__(self, ["yes", "no"], False)
|
||||||
|
|
||||||
|
|
||||||
def input_number(question, min_number, max_number, default=None):
|
def input_number(question, min_number, max_number, default=None):
|
||||||
if default:
|
if default:
|
||||||
question += " [%i]? " % (default)
|
question += " [%i]? " % (default)
|
||||||
|
@ -28,7 +28,7 @@ import launchpadlib.launchpad
|
|||||||
|
|
||||||
import ubuntutools.update_maintainer
|
import ubuntutools.update_maintainer
|
||||||
from ubuntutools.logger import Logger
|
from ubuntutools.logger import Logger
|
||||||
from ubuntutools.question import Question, input_number
|
from ubuntutools.question import Question, YesNoQuestion, input_number
|
||||||
|
|
||||||
from ubuntutools.sponsor_patch.bugtask import BugTask
|
from ubuntutools.sponsor_patch.bugtask import BugTask
|
||||||
from ubuntutools.sponsor_patch.patch import Patch
|
from ubuntutools.sponsor_patch.patch import Patch
|
||||||
@ -89,8 +89,8 @@ def strip_epoch(version):
|
|||||||
return version_without_epoch
|
return version_without_epoch
|
||||||
|
|
||||||
def ask_for_manual_fixing():
|
def ask_for_manual_fixing():
|
||||||
question = Question(["yes", "no"], False)
|
answer = YesNoQuestion().ask("Do you want to resolve this issue manually",
|
||||||
answer = question.ask("Do you want to resolve this issue manually", "yes")
|
"yes")
|
||||||
if answer == "no":
|
if answer == "no":
|
||||||
user_abort()
|
user_abort()
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user