From 7c22cf4825847b8064d4c57a75c673c8aebcb92d Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Tue, 30 Aug 2016 13:22:39 -0400
Subject: [PATCH] clean up strings in signed-repo cli

---
 cli/koji | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/cli/koji b/cli/koji
index 3170e274..c0d66190 100755
--- a/cli/koji
+++ b/cli/koji
@@ -7088,7 +7088,10 @@ def handle_signed_repo(options, session, args):
     parser.add_option('--comps', help='Include a comps file in the repodata')
     parser.add_option('--delta-rpms', metavar='PATH',default=[],
         action='append',
-        help=_('Create delta-rpms. PATH points to (older) rpms to generate against. May be specified multiple times. These have to be reachable by the builder too, so the path needs to reach shared storage.'))
+        help=_('Create delta-rpms. PATH points to (older) rpms to generate '
+            'against. May be specified multiple times. These have to be '
+            'reachable by the builder too, so the path needs to reach shared '
+            'storage.'))
     parser.add_option('--event', type='int',
         help=_('create a signed repository based on a Brew event'))
     parser.add_option('--non-latest', dest='latest', default=True,
@@ -7105,12 +7108,12 @@ def handle_signed_repo(options, session, args):
     if len(args) < 2:
         parser.error(_('You must provide a tag and 1 or more GPG key IDs'))
     if task_opts.allow_unsigned and task_opts.skip_unsigned:
-        parser.error(_('allow_signed and skip_unsigned are mutually exclusive'))
+        parser.error(_('allow_unsigned and skip_unsigned are mutually exclusive'))
     activate_session(session)
     stuffdir = _unique_path('cli-signed')
     if task_opts.comps:
         if not os.path.exists(task_opts.comps):
-            parser.error(_('could not find %s' % task_opts.comps))
+            parser.error(_('could not find %s') % task_opts.comps)
         session.uploadWrapper(task_opts.comps, stuffdir,
             callback=_progress_callback)
         print
@@ -7119,14 +7122,14 @@ def handle_signed_repo(options, session, args):
     if len(task_opts.delta_rpms) > 0:
         for path in task_opts.delta_rpms:
             if not os.path.exists(path):
-                print _("Warning: %s is not reachable locally. If this" % path)
-                print _("  host does not have access to Koji's shared storage")
-                print _("  this can be ignored.")
+                print _("Warning: %s is not reachable locally. If this\n"
+                        "  host does not have access to Koji's shared storage\n"
+                        "  this can be ignored.") % path
     tag = args[0]
     keys = args[1:]
     taginfo = session.getTag(tag)
     if not taginfo:
-        parser.error(_('unknown tag %s' % tag))
+        parser.error(_('unknown tag %s') % tag)
     if len(task_opts.arch) == 0:
         task_opts.arch = taginfo['arches']
         if task_opts.arch == None:
@@ -7134,10 +7137,10 @@ def handle_signed_repo(options, session, args):
     else:
         for a in task_opts.arch:
             if not taginfo['arches'] or a not in taginfo['arches']:
-                print _('Warning: %s is not in the list of tag arches' % a)
+                print _('Warning: %s is not in the list of tag arches') % a
     if task_opts.multilib:
         if not os.path.exists(task_opts.multilib):
-            parser.error(_('could not find %s' % task_opts.multilib))
+            parser.error(_('could not find %s') % task_opts.multilib)
         if 'x86_64' in task_opts.arch and not 'i686' in task_opts.arch:
             parser.error(_('The multilib arch (i686) must be included'))
         if 's390x' in task_opts.arch and not 's390' in task_opts.arch: