From 382dd29e03c90916efe7fc1f18511027ab0d051e Mon Sep 17 00:00:00 2001 From: Juergen Weigert Date: Tue, 29 Jun 2010 15:32:53 +0200 Subject: [PATCH] Make 'trust always' more verbose, so that a user learns how to undo its effect. Removed a few tabs. --- osc/build.py | 1 + osc/commandline.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/osc/build.py b/osc/build.py index ed44215..2aaf45d 100644 --- a/osc/build.py +++ b/osc/build.py @@ -335,6 +335,7 @@ def check_trusted_projects(apiurl, projects): print "Note that malicious packages can compromise the build result or even your system." r = raw_input(trustprompt % { 'project':prj }) if r == '1': + print "adding '%s' to ~/.oscrc: ['%s']['trusted_prj']" % (prj,apiurl) trusted.append(prj) elif r != '2': print "Well, good good bye then :-)" diff --git a/osc/commandline.py b/osc/commandline.py index e29ba8e..a586004 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -1622,7 +1622,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. if cmd == 'approvenew': print "\n *** Approve them all ? [y/n] ***" if sys.stdin.read(1) == "y": - + if not opts.message: opts.message = edit_message() for result in results: @@ -4311,15 +4311,15 @@ Please submit there instead, or use --nodevelproject to force direct submission. otherwise all binary packages in the project will be deleted. usage: - osc wipebinaries OPTS # works in checked out project dir + osc wipebinaries OPTS # works in checked out project dir osc wipebinaries OPTS PROJECT [PACKAGE] ${cmd_option_list} """ args = slash_split(args) - package = project = None - apiurl = self.get_api_url() + package = project = None + apiurl = self.get_api_url() # try to get project and package from checked out dirs if len(args) < 1: -- 2.1.4