From ce1f9928afdab5f0124ad93cbfb98f0e63efdeaa Mon Sep 17 00:00:00 2001
From: Yuming Zhu <yzhu@redhat.com>
Date: Wed, 26 Feb 2020 02:08:41 +0800
Subject: [PATCH] flake8: apply E1 rules

---
 .flake8                         |   2 +-
 builder/kojid                   | 454 +++++++++++-----------
 builder/mergerepos              |  18 +-
 cli/koji                        |   4 +-
 cli/koji_cli/commands.py        | 422 ++++++++++-----------
 cli/koji_cli/lib.py             |  30 +-
 hub/kojihub.py                  | 652 ++++++++++++++++----------------
 hub/kojixmlrpc.py               |  16 +-
 koji/__init__.py                |  66 ++--
 koji/arch.py                    |   4 +-
 koji/auth.py                    |  10 +-
 koji/daemon.py                  |   6 +-
 koji/plugin.py                  |   2 +-
 koji/policy.py                  |   2 +-
 koji/tasks.py                   |   8 +-
 koji/util.py                    |  10 +-
 koji/xmlrpcplus.py              |   4 +-
 plugins/builder/runroot.py      |  20 +-
 plugins/cli/runroot.py          |  12 +-
 plugins/cli/save_failed_tree.py |  12 +-
 plugins/hub/rpm2maven.py        |   4 +-
 plugins/hub/runroot_hub.py      |   2 +-
 plugins/hub/save_failed_tree.py |   2 +-
 util/koji-gc                    |  14 +-
 util/koji-shadow                |  12 +-
 util/kojira                     |  50 +--
 vm/kojikamid.py                 |   2 +-
 vm/kojivmd                      |  34 +-
 www/kojiweb/index.py            |  16 +-
 www/lib/kojiweb/util.py         |  26 +-
 30 files changed, 958 insertions(+), 958 deletions(-)

diff --git a/.flake8 b/.flake8
index 27b4d7f7..b20a51cc 100644
--- a/.flake8
+++ b/.flake8
@@ -1,5 +1,5 @@
 [flake8]
-select = I,C,F,E265
+select = I,C,F,E1,E265
 exclude =
     .git,
     __pycache__,
diff --git a/builder/kojid b/builder/kojid
index a775b5d9..fd607a75 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -231,7 +231,7 @@ class BuildRoot(object):
         self.tag_name = self.config['name']
         if self.config['id'] != repo_info['tag_id']:
             raise koji.BuildrootError("tag/repo mismatch: %s vs %s" \
-                    % (self.config['name'], repo_info['tag_name']))
+                                      % (self.config['name'], repo_info['tag_name']))
         repo_state = koji.REPO_STATES[repo_info['state']]
         if repo_state == 'EXPIRED':
             # This should be ok. Expired repos are still intact, just not
@@ -698,7 +698,7 @@ class BuildRoot(object):
                 path_comps = relpath.split('/')
                 if len(path_comps) < 3:
                     raise koji.BuildrootError('files found in unexpected path in local Maven repo, directory: %s, files: %s' % \
-                        (relpath, ', '.join([f['filename'] for f in maven_files])))
+                                              (relpath, ', '.join([f['filename'] for f in maven_files])))
                 # extract the Maven info from the path within the local repo
                 maven_info = {'version': path_comps[-1],
                               'artifact_id': path_comps[-2],
@@ -966,7 +966,7 @@ class BuildTask(BaseTaskHandler):
                 # make sure specified repo matches target
                 if repo_info['tag_id'] != target_info['build_tag']:
                     raise koji.BuildError('Repo/Target mismatch: %s/%s' \
-                            % (repo_info['tag_name'], target_info['build_tag_name']))
+                                          % (repo_info['tag_name'], target_info['build_tag_name']))
         else:
             # if repo_id is specified, we can allow the 'target' arg to simply specify
             # the destination tag (since the repo specifies the build tag).
@@ -1022,10 +1022,10 @@ class BuildTask(BaseTaskHandler):
             # Make sure package is on the list for this tag
             if pkg_cfg is None:
                 raise koji.BuildError("package %s not in list for tag %s" \
-                        % (data['name'], target_info['dest_tag_name']))
+                                      % (data['name'], target_info['dest_tag_name']))
             elif pkg_cfg['blocked']:
                 raise koji.BuildError("package %s is blocked for tag %s" \
-                        % (data['name'], target_info['dest_tag_name']))
+                                      % (data['name'], target_info['dest_tag_name']))
             # TODO - more pre tests
         archlist = self.getArchList(build_tag, h, extra=extra_arches)
         # let the system know about the build we're attempting
@@ -1034,11 +1034,11 @@ class BuildTask(BaseTaskHandler):
             build_id = self.session.host.initBuild(data)
         # (initBuild raises an exception if there is a conflict)
         failany = (self.opts.get('fail_fast', False)
-                    or not getattr(self.options, 'build_arch_can_fail', False))
+                   or not getattr(self.options, 'build_arch_can_fail', False))
         try:
             self.extra_information = { "src": src, "data": data, "target": target }
             srpm,rpms,brmap,logs = self.runBuilds(srpm, build_tag, archlist,
-                    repo_info['id'], failany=failany)
+                                                  repo_info['id'], failany=failany)
 
             if opts.get('scratch'):
                 # scratch builds do not get imported
@@ -1192,8 +1192,8 @@ class BuildTask(BaseTaskHandler):
                 archlist = [ a for a in archlist if a not in excludearch ]
             if not archlist:
                 raise koji.BuildError("No valid arches were found. tag %r, "
-                        "exclusive %r, exclude %r" % (tag_arches,
-                        exclusivearch, excludearch))
+                                      "exclusive %r, exclude %r" % (tag_arches,
+                                                                    exclusivearch, excludearch))
             if set(archlist) != set(tag_arches):
                 return random.choice(archlist)
             else:
@@ -1256,10 +1256,10 @@ class BuildTask(BaseTaskHandler):
         # create the tagBuild subtask
         # this will handle the "post tests"
         task_id = self.session.host.subtask(method='tagBuild',
-                                       arglist=[dest_tag,build_id,False,None,True],
-                                       label='tag',
-                                       parent=self.id,
-                                       arch='noarch')
+                                            arglist=[dest_tag,build_id,False,None,True],
+                                            label='tag',
+                                            parent=self.id,
+                                            arch='noarch')
         self.wait(task_id)
 
 
@@ -1506,10 +1506,10 @@ class MavenTask(MultiPlatformTask):
                 # Make sure package is on the list for this tag
                 if dest_cfg is None:
                     raise koji.BuildError("package %s not in list for tag %s" \
-                        % (build_info['name'], dest_tag['name']))
+                                          % (build_info['name'], dest_tag['name']))
                 elif dest_cfg['blocked']:
                     raise koji.BuildError("package %s is blocked for tag %s" \
-                        % (build_info['name'], dest_tag['name']))
+                                          % (build_info['name'], dest_tag['name']))
 
             build_info = self.session.host.initMavenBuild(self.id, build_info, maven_info)
             self.build_id = build_info['id']
@@ -1666,8 +1666,8 @@ class BuildMavenTask(BaseBuildTask):
         if self.opts.get('patches'):
             # filter out directories and files beginning with . (probably scm metadata)
             patches = [patch for patch in os.listdir(patchcheckoutdir) if \
-                           os.path.isfile(os.path.join(patchcheckoutdir, patch)) and \
-                           patch.endswith('.patch')]
+                       os.path.isfile(os.path.join(patchcheckoutdir, patch)) and \
+                       patch.endswith('.patch')]
             if not patches:
                 raise koji.BuildError('no patches found at %s' % self.opts.get('patches'))
             patches.sort()
@@ -2018,10 +2018,10 @@ class WrapperRPMTask(BaseBuildTask):
                 # Make sure package is on the list for this tag
                 if pkg_cfg is None:
                     raise koji.BuildError("package %s not in list for tag %s" \
-                          % (data['name'], build_target['dest_tag_name']))
+                                          % (data['name'], build_target['dest_tag_name']))
                 elif pkg_cfg['blocked']:
                     raise koji.BuildError("package %s is blocked for tag %s" \
-                          % (data['name'], build_target['dest_tag_name']))
+                                          % (data['name'], build_target['dest_tag_name']))
             self.new_build_id = self.session.host.initBuild(data)
 
         try:
@@ -2046,7 +2046,7 @@ class WrapperRPMTask(BaseBuildTask):
                     if self.new_build_id:
                         self.session.host.failBuild(self.id, self.new_build_id)
                     raise koji.BuildError('multiple srpms found in %s: %s, %s' % \
-                        (resultdir, srpm, filename))
+                                          (resultdir, srpm, filename))
             elif filename.endswith('.rpm'):
                 rpms.append(filename)
             elif filename.endswith('.log'):
@@ -2055,7 +2055,7 @@ class WrapperRPMTask(BaseBuildTask):
                 if self.new_build_id:
                     self.session.host.failBuild(self.id, self.new_build_id)
                 raise koji.BuildError('unexpected file found in %s: %s' % \
-                    (resultdir, filename))
+                                      (resultdir, filename))
 
         if not srpm:
             if self.new_build_id:
@@ -2139,10 +2139,10 @@ class ChainMavenTask(MultiPlatformTask):
                 # Make sure package is on the list for this tag
                 if dest_cfg is None:
                     raise koji.BuildError("package %s not in list for tag %s" \
-                        % (package, dest_tag['name']))
+                                          % (package, dest_tag['name']))
                 elif dest_cfg['blocked']:
                     raise koji.BuildError("package %s is blocked for tag %s" \
-                        % (package, dest_tag['name']))
+                                          % (package, dest_tag['name']))
 
         self.depmap = {}
         for package, params in builds.items():
@@ -2357,7 +2357,7 @@ class BuildImageTask(MultiPlatformTask):
     def initImageBuild(self, name, version, release, target_info, opts):
         """create a build object for this image build"""
         pkg_cfg = self.session.getPackageConfig(target_info['dest_tag_name'],
-             name)
+                                                name)
         self.logger.debug("%r" % pkg_cfg)
         if not opts.get('skip_tag') and not opts.get('scratch'):
             # Make sure package is on the list for this tag
@@ -2366,7 +2366,7 @@ class BuildImageTask(MultiPlatformTask):
             elif pkg_cfg['blocked']:
                 raise koji.BuildError("package (image)  %s is blocked for tag %s" % (name, target_info['dest_tag_name']))
         return self.session.host.initImageBuild(self.id,
-            dict(name=name, version=version, release=release, epoch=0))
+                                                dict(name=name, version=version, release=release, epoch=0))
 
     def getRelease(self, name, ver):
         """return the next available release number for an N-V"""
@@ -2408,7 +2408,7 @@ class BuildBaseImageTask(BuildImageTask):
                 raise koji.ApplianceError('The Release may not have a hyphen')
             if not opts.get('scratch'):
                 bld_info = self.initImageBuild(name, version, release,
-                    target_info, opts)
+                                               target_info, opts)
 
             subtasks = {}
             self.logger.debug("Spawning jobs for image arches: %r" % (arches))
@@ -2418,7 +2418,7 @@ class BuildBaseImageTask(BuildImageTask):
                 subtasks[arch] = self.session.host.subtask(
                     method='createImage',
                     arglist=[name, version, release, arch, target_info,
-                    build_tag, repo_info, inst_url, opts],
+                             build_tag, repo_info, inst_url, opts],
                     label=arch, parent=self.id, arch=arch)
                 if arch in opts.get('optional_arches', []):
                     canfail.append(subtasks[arch])
@@ -2476,7 +2476,7 @@ class BuildBaseImageTask(BuildImageTask):
                 self.session.host.moveImageBuildToScratch(self.id, results)
             else:
                 self.session.host.completeImageBuild(self.id, bld_info['id'],
-                    results)
+                                                     results)
 
         except (SystemExit,ServerExit,KeyboardInterrupt):
             # we do not trap these
@@ -2492,8 +2492,8 @@ class BuildBaseImageTask(BuildImageTask):
         # tag it
         if not opts.get('scratch') and not opts.get('skip_tag'):
             tag_task_id = self.session.host.subtask(method='tagBuild',
-                arglist=[target_info['dest_tag'], bld_info['id'], False, None, True],
-                label='tag', parent=self.id, arch='noarch')
+                                                    arglist=[target_info['dest_tag'], bld_info['id'], False, None, True],
+                                                    label='tag', parent=self.id, arch='noarch')
             self.wait(tag_task_id)
 
         # report results
@@ -2540,11 +2540,11 @@ class BuildApplianceTask(BuildImageTask):
                 release = self.getRelease(name, version)
             if not opts.get('scratch'):
                 bld_info = self.initImageBuild(name, version, release,
-                    target_info, opts)
+                                               target_info, opts)
             create_task_id = self.session.host.subtask(method='createAppliance',
-                arglist=[name, version, release, arch, target_info, build_tag,
-                    repo_info, ksfile, opts],
-                label='appliance', parent=self.id, arch=arch)
+                                                       arglist=[name, version, release, arch, target_info, build_tag,
+                                                                repo_info, ksfile, opts],
+                                                       label='appliance', parent=self.id, arch=arch)
             results = self.wait(create_task_id)
             self.logger.info('image build task (%s) completed' % create_task_id)
             self.logger.info('results: %s' % results)
@@ -2578,14 +2578,14 @@ class BuildApplianceTask(BuildImageTask):
         # tag it
         if not opts.get('scratch') and not opts.get('skip_tag'):
             tag_task_id = self.session.host.subtask(method='tagBuild',
-                arglist=[target_info['dest_tag'], bld_info['id'], False, None, True],
-                label='tag', parent=self.id, arch='noarch')
+                                                    arglist=[target_info['dest_tag'], bld_info['id'], False, None, True],
+                                                    label='tag', parent=self.id, arch='noarch')
             self.wait(tag_task_id)
 
         # report results
         if opts.get('scratch'):
             respath = os.path.join(koji.pathinfo.work(),
-                koji.pathinfo.taskrelpath(create_task_id))
+                                   koji.pathinfo.taskrelpath(create_task_id))
             report = 'Scratch '
         else:
             respath = koji.pathinfo.imagebuild(bld_info)
@@ -2613,7 +2613,7 @@ class BuildLiveCDTask(BuildImageTask):
             opts = {}
         if not image_enabled:
             self.logger.error("LiveCD features require the following dependencies: "
-                    "pykickstart, pycdio, and possibly python-hashlib")
+                              "pykickstart, pycdio, and possibly python-hashlib")
             raise koji.LiveCDError('LiveCD functions not available')
 
         # build the image
@@ -2624,11 +2624,11 @@ class BuildLiveCDTask(BuildImageTask):
                 release = self.getRelease(name, version)
             if not opts.get('scratch'):
                 bld_info = self.initImageBuild(name, version, release,
-                    target_info, opts)
+                                               target_info, opts)
             create_task_id = self.session.host.subtask(method='createLiveCD',
-                arglist=[name, version, release, arch, target_info, build_tag,
-                repo_info, ksfile, opts],
-                label='livecd', parent=self.id, arch=arch)
+                                                       arglist=[name, version, release, arch, target_info, build_tag,
+                                                                repo_info, ksfile, opts],
+                                                       label='livecd', parent=self.id, arch=arch)
             results = self.wait(create_task_id)
             self.logger.info('image build task (%s) completed' % create_task_id)
             self.logger.info('results: %s' % results)
@@ -2662,14 +2662,14 @@ class BuildLiveCDTask(BuildImageTask):
         # tag it if necessary
         if not opts.get('scratch') and not opts.get('skip_tag'):
             tag_task_id = self.session.host.subtask(method='tagBuild',
-                arglist=[target_info['dest_tag'], bld_info['id'], False, None, True],
-                label='tag', parent=self.id, arch='noarch')
+                                                    arglist=[target_info['dest_tag'], bld_info['id'], False, None, True],
+                                                    label='tag', parent=self.id, arch='noarch')
             self.wait(tag_task_id)
 
         # report the results
         if opts.get('scratch'):
             respath = os.path.join(koji.pathinfo.work(),
-                koji.pathinfo.taskrelpath(create_task_id))
+                                   koji.pathinfo.taskrelpath(create_task_id))
             report = 'Scratch '
         else:
             respath = koji.pathinfo.imagebuild(bld_info)
@@ -2704,7 +2704,7 @@ class BuildLiveMediaTask(BuildImageTask):
         if not image_enabled:
             # XXX - are these still required here?
             self.logger.error("Missing the following dependencies: "
-                    "pykickstart, pycdio, and possibly python-hashlib")
+                              "pykickstart, pycdio, and possibly python-hashlib")
             raise koji.PreBuildError('Live Media functions not available')
 
         # build the image
@@ -2715,14 +2715,14 @@ class BuildLiveMediaTask(BuildImageTask):
                 release = self.getRelease(name, version)
             if not opts.get('scratch'):
                 bld_info = self.initImageBuild(name, version, release,
-                    target_info, opts)
+                                               target_info, opts)
             subtasks = {}
             canfail = []
             for arch in arches:
                 subtasks[arch] = self.subtask('createLiveMedia',
-                    [name, version, release, arch, target_info, build_tag,
-                        repo_info, ksfile, opts],
-                    label='livemedia %s' % arch, arch=arch)
+                                              [name, version, release, arch, target_info, build_tag,
+                                               repo_info, ksfile, opts],
+                                              label='livemedia %s' % arch, arch=arch)
                 if arch in opts.get('optional_arches', []):
                     canfail.append(subtasks[arch])
             self.logger.debug("Tasks that can fail: %r", canfail)
@@ -2762,9 +2762,9 @@ class BuildLiveMediaTask(BuildImageTask):
                     if arch in ignored_arches:
                         continue
                     arglist = [spec_url, target_info, bld_info, tinfo,
-                                {'repo_id': repo_info['id']}]
+                               {'repo_id': repo_info['id']}]
                     wrapper_tasks[arch] = self.subtask('wrapperRPM', arglist,
-                                label='wrapper %s' % arch, arch='noarch')
+                                                       label='wrapper %s' % arch, arch='noarch')
 
                 results2 = self.wait(to_list(wrapper_tasks.values()), all=True, failany=True)
                 self.logger.debug('wrapper results: %r', results2)
@@ -2800,8 +2800,8 @@ class BuildLiveMediaTask(BuildImageTask):
         # tag it if necessary
         if not opts.get('scratch') and not opts.get('skip_tag'):
             tag_task_id = self.session.host.subtask(method='tagBuild',
-                arglist=[target_info['dest_tag'], bld_info['id'], False, None, True],
-                label='tag', parent=self.id, arch='noarch')
+                                                    arglist=[target_info['dest_tag'], bld_info['id'], False, None, True],
+                                                    label='tag', parent=self.id, arch='noarch')
             self.wait(tag_task_id)
 
         # report the results
@@ -2919,7 +2919,7 @@ class ImageTask(BaseTaskHandler):
                                    "'%s' : %s" % (kspath, e))
         except kserrors.KickstartError as e:
             raise koji.LiveCDError("Failed to parse kickstart file "
-                                    "'%s' : %s" % (kspath, e))
+                                   "'%s' : %s" % (kspath, e))
 
     def prepareKickstart(self, repo_info, target_info, arch, broot, opts):
         """
@@ -3002,27 +3002,27 @@ class ImageTask(BaseTaskHandler):
         # Duplicated with pungi-fedora fedora.conf
         # see https://pagure.io/koji/pull-request/817
         substitutions = {
-                         'Beta': 'B',
-                      'Rawhide': 'rawh',
-                'Astronomy_KDE': 'AstK',
-                       'Atomic': 'AH',
-                     'Cinnamon': 'Cinn',
-                        'Cloud': 'C',
-                 'Design_suite': 'Dsgn',
-               'Electronic_Lab': 'Elec',
-                   'Everything': 'E',
+            'Beta': 'B',
+            'Rawhide': 'rawh',
+            'Astronomy_KDE': 'AstK',
+            'Atomic': 'AH',
+            'Cinnamon': 'Cinn',
+            'Cloud': 'C',
+            'Design_suite': 'Dsgn',
+            'Electronic_Lab': 'Elec',
+            'Everything': 'E',
                         'Games': 'Game',
                        'Images': 'img',
                       'Jam_KDE': 'Jam',
-                  'MATE_Compiz': 'MATE',
-             # Note https://pagure.io/pungi-fedora/issue/533
-             'Python-Classroom': 'Clss',
-             'Python_Classroom': 'Clss',
+            'MATE_Compiz': 'MATE',
+            # Note https://pagure.io/pungi-fedora/issue/533
+            'Python-Classroom': 'Clss',
+            'Python_Classroom': 'Clss',
                      'Robotics': 'Robo',
-               'Scientific_KDE': 'SciK',
+            'Scientific_KDE': 'SciK',
                      'Security': 'Sec',
                        'Server': 'S',
-                  'Workstation': 'WS',
+            'Workstation': 'WS',
             'WorkstationOstree': 'WS',
         }
 
@@ -3125,7 +3125,7 @@ class ApplianceTask(ImageTask):
 
         if not opts.get('scratch'):
             hdrlist = self.getImagePackages(os.path.join(broot.rootdir(),
-                cachedir[1:]))
+                                                         cachedir[1:]))
             broot.markExternalRPMs(hdrlist)
             imgdata['rpmlist'] = hdrlist
 
@@ -3216,7 +3216,7 @@ class LiveCDTask(ImageTask):
         self.opts = opts
 
         broot = self.makeImgBuildRoot(build_tag, repo_info, arch,
-            'livecd-build')
+                                      'livecd-build')
         kspath = self.fetchKickstart(broot, ksfile, target_info['build_tag_name'])
         self.readKickstart(kspath, opts)
         kskoji = self.prepareKickstart(repo_info, target_info, arch, broot, opts)
@@ -3268,19 +3268,19 @@ class LiveCDTask(ImageTask):
         self.uploadFile(isosrc, remoteName=isoname)
 
         imgdata = {'arch': arch,
-            'files': [isoname],
-            'rootdev': None,
-            'task_id': self.id,
-            'logs': ['build.log', 'mock_output.log', 'root.log', 'state.log',
-                     'livecd.log', os.path.basename(ksfile),
-                     os.path.basename(kskoji)],
-            'name': name,
-            'version': version,
-            'release': release
-        }
+                   'files': [isoname],
+                   'rootdev': None,
+                   'task_id': self.id,
+                   'logs': ['build.log', 'mock_output.log', 'root.log', 'state.log',
+                            'livecd.log', os.path.basename(ksfile),
+                            os.path.basename(kskoji)],
+                   'name': name,
+                   'version': version,
+                   'release': release
+                   }
         if not opts.get('scratch'):
             hdrlist = self.getImagePackages(os.path.join(broot.rootdir(),
-                                            cachedir[1:]))
+                                                         cachedir[1:]))
             imgdata ['rpmlist'] = hdrlist
             broot.markExternalRPMs(hdrlist)
 
@@ -3397,7 +3397,7 @@ class LiveMediaTask(ImageTask):
         self.opts = opts
 
         broot = self.makeImgBuildRoot(build_tag, repo_info, arch,
-            'livemedia-build')
+                                      'livemedia-build')
         kspath = self.fetchKickstart(broot, ksfile, target_info['build_tag_name'])
         self.readKickstart(kspath, opts)
         kskoji = self.prepareKickstart(repo_info, target_info, arch, broot, opts)
@@ -3415,7 +3415,7 @@ class LiveMediaTask(ImageTask):
                '--resultdir', resultdir,
                '--project', name,
                # '--tmp', '/tmp'
-              ]
+               ]
 
 
         volid = opts.get('volid')
@@ -3430,12 +3430,12 @@ class LiveMediaTask(ImageTask):
         cmd.extend(['--make-iso',
                     '--volid', volid,
                     '--iso-only',
-                   ])
+                    ])
 
         isoname='%s-%s-%s-%s.iso' % (name, arch, version, release)
         cmd.extend(['--iso-name', isoname,
                     '--releasever', version,
-                   ])
+                    ])
 
 
         if arch == 'x86_64':
@@ -3453,7 +3453,7 @@ class LiveMediaTask(ImageTask):
         logdirs = [
             os.path.join(broot.tmpdir(), 'lmc-logs'),
             os.path.join(broot.tmpdir(), 'lmc-logs/anaconda'),
-            ]
+        ]
         for logdir in logdirs:
             if not os.path.isdir(logdir):
                 continue
@@ -3499,16 +3499,16 @@ class LiveMediaTask(ImageTask):
         self.uploadFile(isosrc, remoteName=isoname)
 
         imgdata = {'arch': arch,
-            'files': [isoname],
-            'rootdev': None,
-            'task_id': self.id,
-            'logs': ['build.log', 'mock_output.log', 'root.log', 'state.log',
-                     'livemedia-out.log', os.path.basename(ksfile),
-                     os.path.basename(kskoji)],
-            'name': name,
-            'version': version,
-            'release': release
-        }
+                   'files': [isoname],
+                   'rootdev': None,
+                   'task_id': self.id,
+                   'logs': ['build.log', 'mock_output.log', 'root.log', 'state.log',
+                            'livemedia-out.log', os.path.basename(ksfile),
+                            os.path.basename(kskoji)],
+                   'name': name,
+                   'version': version,
+                   'release': release
+                   }
         if not opts.get('scratch'):
             # TODO - generate list of rpms in image
             # (getImagePackages doesn't work here)
@@ -3549,7 +3549,7 @@ class OzImageTask(BaseTaskHandler):
             logfile = os.path.join(self.workdir, 'checkout-%s.log' % self.arch)
             self.run_callbacks('preSCMCheckout', scminfo=scm.get_info(), build_tag=build_tag, scratch=self.opts.get('scratch'))
             scmsrcdir = scm.checkout(self.workdir, self.session,
-                self.getUploadDir(), logfile)
+                                     self.getUploadDir(), logfile)
             self.run_callbacks("postSCMCheckout",
                                scminfo=scm.get_info(),
                                build_tag=build_tag,
@@ -3589,10 +3589,10 @@ class OzImageTask(BaseTaskHandler):
             ks.readKickstart(kspath)
         except IOError as e:
             raise koji.BuildError("Failed to read kickstart file "
-                                   "'%s' : %s" % (kspath, e))
+                                  "'%s' : %s" % (kspath, e))
         except kserrors.KickstartError as e:
             raise koji.BuildError("Failed to parse kickstart file "
-                                    "'%s' : %s" % (kspath, e))
+                                  "'%s' : %s" % (kspath, e))
         return ks
 
     def prepareKickstart(self, kspath, install_tree):
@@ -3627,7 +3627,7 @@ class OzImageTask(BaseTaskHandler):
             # --repo was not given, so we use the target's build repo
             path_info = koji.PathInfo(topdir=self.options.topurl)
             repopath = path_info.repo(self.repo_info['id'],
-                self.target_info['build_tag_name'])
+                                      self.target_info['build_tag_name'])
             baseurl = '%s/%s' % (repopath, self.arch)
             self.logger.debug('BASEURL: %s' % baseurl)
             ks.handler.repo.repoList.append(repo_class(
@@ -3686,7 +3686,7 @@ class OzImageTask(BaseTaskHandler):
             'rhevm_image_format': 'qcow2',
             'tdl_require_root_pw': False,
             'image_manager_args': {
-              'storage_path': os.path.join(self.workdir, 'output_image')},
+                'storage_path': os.path.join(self.workdir, 'output_image')},
         }
 
     def makeTemplate(self, name, inst_tree):
@@ -3705,9 +3705,9 @@ class OzImageTask(BaseTaskHandler):
         # TODO: intelligently guess the distro based on the install tree URL
         distname, distver = self.parseDistro(self.opts.get('distro'))
         if self.arch in ['armhfp','armv7hnl','armv7hl']:
-           arch = 'armv7l'
+            arch = 'armv7l'
         else:
-           arch = self.arch
+            arch = self.arch
         template = """<template>
     <name>%s</name>
         <os>
@@ -3857,7 +3857,7 @@ class BaseImageTask(OzImageTask):
                   'vagrant-vmware-fusion': self._buildOVA,
                   'vagrant-hyperv': self._buildOVA,
                   'docker':      self._buildDocker
-        }
+                  }
         # add a handler to the logger so that we capture ImageFactory's logging
         self.fhandler = logging.FileHandler(self.ozlog)
         self.bd = BuildDispatcher()
@@ -3900,7 +3900,7 @@ class BaseImageTask(OzImageTask):
         for fmt in images:
             imginfo[fmt] = images[fmt]
             lxml = self.fixImageXML(fmt, 'libvirt-%s-%s.xml' % (fmt, self.arch),
-                self.base_img.base_image.parameters['libvirt_xml'])
+                                    self.base_img.base_image.parameters['libvirt_xml'])
             imginfo[fmt]['libvirt'] = lxml
         return imginfo
 
@@ -3933,7 +3933,7 @@ class BaseImageTask(OzImageTask):
             if 'No disk activity' in details:
                 details = 'Automated install failed or prompted for input. See the screenshot in the task results for more information.'
             raise koji.ApplianceError('Image status is %s: %s' %
-                (status, details))
+                                      (status, details))
 
     def _mergeFactoryParams(self, img_opts, fixed_params):
         """
@@ -3993,14 +3993,14 @@ class BaseImageTask(OzImageTask):
         rawimg = os.path.join(self.workdir, self.imgname + '.raw')
         cmd = ['/bin/cp', self.base_img.base_image.data, rawimg]
         conlog = os.path.join(self.workdir,
-            'xz-cp-%s-%s.log' % (format, self.arch))
+                              'xz-cp-%s-%s.log' % (format, self.arch))
         log_output(self.session, cmd[0], cmd, conlog, self.getUploadDir(),
-            logerror=1)
+                   logerror=1)
         cmd = ['/usr/bin/xz', '-z9T2', rawimg]
         conlog = os.path.join(self.workdir,
-            'xz-%s-%s.log' % (format, self.arch))
+                              'xz-%s-%s.log' % (format, self.arch))
         log_output(self.session, cmd[0], cmd, conlog, self.getUploadDir(),
-            logerror=1)
+                   logerror=1)
         return {'image': newimg}
 
 
@@ -4027,7 +4027,7 @@ class BaseImageTask(OzImageTask):
         cmd = ['/bin/tar', '-Sczvf', newimg, 'disk.raw']
         conlog = os.path.join(self.workdir, 'tar-gz-%s.log' % self.arch)
         log_output(self.session, cmd[0], cmd, conlog, self.getUploadDir(),
-            logerror=1, cwd=imgdir)
+                   logerror=1, cwd=imgdir)
 
         # now that we've made the tarball, we don't need this hardlink
         os.unlink(rawimg)
@@ -4055,15 +4055,15 @@ class BaseImageTask(OzImageTask):
                'if=%s' % self.base_img.base_image.data,
                'of=%s' % fsimg]
         conlog = os.path.join(self.workdir,
-            'squashfs-dd-%s-%s.log' % (format, self.arch))
+                              'squashfs-dd-%s-%s.log' % (format, self.arch))
         log_output(self.session, cmd[0], cmd, conlog, self.getUploadDir(),
-            logerror=1)
+                   logerror=1)
         cmd = ['/usr/sbin/mksquashfs', os.path.join(self.workdir, 'squashfs-root'),
                newimg, '-comp', 'xz', '-noappend']
         conlog = os.path.join(self.workdir,
-            'squashfs-mksquashfs-%s-%s.log' % (format, self.arch))
+                              'squashfs-mksquashfs-%s-%s.log' % (format, self.arch))
         log_output(self.session, cmd[0], cmd, conlog, self.getUploadDir(),
-            logerror=1)
+                   logerror=1)
         return {'image': newimg}
 
     def _buildOVA(self, format):
@@ -4105,9 +4105,9 @@ class BaseImageTask(OzImageTask):
             img_opts['hyperv_ova_format'] = 'hyperv-vagrant'
             fixed_params = [ 'hyperv_ova_format' ]
         targ = self._do_target_image(self.base_img.base_image.identifier,
-            format.replace('-ova', ''), img_opts=img_opts, fixed_params=fixed_params)
+                                     format.replace('-ova', ''), img_opts=img_opts, fixed_params=fixed_params)
         targ2 = self._do_target_image(targ.target_image.identifier, 'OVA',
-            img_opts=img_opts, fixed_params=fixed_params)
+                                      img_opts=img_opts, fixed_params=fixed_params)
         return {'image': targ2.target_image.data}
 
     def _buildDocker(self, format):
@@ -4122,7 +4122,7 @@ class BaseImageTask(OzImageTask):
         """
         img_opts = {'compress': 'xz'}
         targ = self._do_target_image(self.base_img.base_image.identifier,
-            'docker', img_opts=img_opts)
+                                     'docker', img_opts=img_opts)
         return {'image': targ.target_image.data}
 
     def _do_target_image(self, base_id, image_type, img_opts=None, fixed_params=None):
@@ -4154,7 +4154,7 @@ class BaseImageTask(OzImageTask):
         self._mergeFactoryParams(img_opts, fixed_params)
         self.logger.debug('img_opts_post_merge: %s' % img_opts)
         target = self.bd.builder_for_target_image(image_type,
-            image_id=base_id, template=None, parameters=img_opts)
+                                                  image_id=base_id, template=None, parameters=img_opts)
         target.target_thread.join()
         self._checkImageState(target)
         return target
@@ -4175,7 +4175,7 @@ class BaseImageTask(OzImageTask):
             ofmt = 'vhd'
         newimg = os.path.join(self.workdir, self.imgname + '.%s' % ofmt)
         cmd = ['/usr/bin/qemu-img', 'convert', '-f', 'raw', '-O',
-            format, self.base_img.base_image.data, newimg]
+               format, self.base_img.base_image.data, newimg]
         if format == 'qcow':
             cmd.insert(2, '-c') # enable compression for qcow images
         if format == 'qcow2':
@@ -4189,9 +4189,9 @@ class BaseImageTask(OzImageTask):
             # Factory does not use a full path - for consistency, force that here
             cmd[0] = '/usr/bin/qemu-img'
         conlog = os.path.join(self.workdir,
-            'qemu-img-%s-%s.log' % (format, self.arch))
+                              'qemu-img-%s-%s.log' % (format, self.arch))
         log_output(self.session, cmd[0], cmd, conlog,
-            self.getUploadDir(), logerror=1)
+                   self.getUploadDir(), logerror=1)
         return {'image': newimg}
 
     def handler(self, name, version, release, arch, target_info, build_tag, repo_info, inst_tree, opts=None):
@@ -4211,8 +4211,8 @@ class BaseImageTask(OzImageTask):
         kspath = self.fetchKickstart(build_tag=target_info['build_tag_name'])
         ks = self.prepareKickstart(kspath, inst_tree)
         kskoji = self.writeKickstart(ks,
-            os.path.join(self.workdir, 'koji-%s-%i-base.ks' %
-            (self.target_info['build_tag_name'], self.id)))
+                                     os.path.join(self.workdir, 'koji-%s-%i-base.ks' %
+                                                  (self.target_info['build_tag_name'], self.id)))
 
         # auto-generate a TDL file and config dict for ImageFactory
         self.imgname = '%s-%s-%s.%s' % (name, version, release, self.arch)
@@ -4280,7 +4280,7 @@ class BaseImageTask(OzImageTask):
                 imgdata['rpmlist'].append(rpm)
             # TODO: hack to make this work for now, need to refactor
             br = BuildRoot(self.session, self.options, build_tag, self.arch,
-                self.id, repo_id=self.repo_info['id'])
+                           self.id, repo_id=self.repo_info['id'])
             br.markExternalRPMs(imgdata['rpmlist'])
 
         # upload the results
@@ -4321,7 +4321,7 @@ class BuildIndirectionImageTask(OzImageTask):
     def initImageBuild(self, name, version, release, target_info, opts):
         """create a build object for this image build"""
         pkg_cfg = self.session.getPackageConfig(target_info['dest_tag_name'],
-             name)
+                                                name)
         self.logger.debug("%r" % pkg_cfg)
         if not opts.get('skip_tag') and not opts.get('scratch'):
             # Make sure package is on the list for this tag
@@ -4330,7 +4330,7 @@ class BuildIndirectionImageTask(OzImageTask):
             elif pkg_cfg['blocked']:
                 raise koji.BuildError("package (image)  %s is blocked for tag %s" % (name, target_info['dest_tag_name']))
         return self.session.host.initImageBuild(self.id,
-            dict(name=name, version=version, release=release, epoch=0))
+                                                dict(name=name, version=version, release=release, epoch=0))
 
     def getRelease(self, name, ver):
         """return the next available release number for an N-V"""
@@ -4361,7 +4361,7 @@ class BuildIndirectionImageTask(OzImageTask):
             self.run_callbacks('preSCMCheckout', scminfo=scm.get_info(), build_tag=build_tag, scratch=self.opts.get('scratch'))
             logfile = os.path.join(self.workdir, 'checkout.log')
             scmsrcdir = scm.checkout(self.workdir, self.session,
-                self.getUploadDir(), logfile)
+                                     self.getUploadDir(), logfile)
             self.run_callbacks("postSCMCheckout",
                                scminfo=scm.get_info(),
                                build_tag=build_tag,
@@ -4536,12 +4536,12 @@ class BuildIndirectionImageTask(OzImageTask):
         bld_info = None
         if not opts['scratch']:
             bld_info = self.initImageBuild(name, version, release,
-                target_info, opts)
+                                           target_info, opts)
 
         try:
             return self._do_indirection(opts, base_factory_image, utility_factory_image,
-                                 indirection_template, tlog, ozlog, fhandler,
-                                 bld_info, target_info, bd)
+                                        indirection_template, tlog, ozlog, fhandler,
+                                        bld_info, target_info, bd)
         except:
             if not opts.get('scratch'):
                 # scratch builds do not get imported
@@ -4587,8 +4587,8 @@ class BuildIndirectionImageTask(OzImageTask):
                     target_image.status='COMPLETE'
                 else:
                     target = bd.builder_for_target_image('indirection',
-                        image_id=base_factory_image.identifier,
-                        parameters=params)
+                                                         image_id=base_factory_image.identifier,
+                                                         parameters=params)
                     target.target_thread.join()
             except Exception as e:
                 self.logger.debug("Exception encountered during target build")
@@ -4605,7 +4605,7 @@ class BuildIndirectionImageTask(OzImageTask):
                 tlog.removeHandler(fhandler)
                 self.uploadFile(ozlog)
             raise koji.ApplianceError('Image status is %s: %s' %
-                (target.target_image.status, target.target_image.status_detail))
+                                      (target.target_image.status, target.target_image.status_detail))
 
         self.uploadFile(target.target_image.data, remoteName=os.path.basename(results_loc))
 
@@ -4627,13 +4627,13 @@ class BuildIndirectionImageTask(OzImageTask):
             self.session.host.moveImageBuildToScratch(self.id, results)
         else:
             self.session.host.completeImageBuild(self.id, bld_info['id'],
-                results)
+                                                 results)
 
         # tag it
         if not opts.get('scratch') and not opts.get('skip_tag'):
             tag_task_id = self.session.host.subtask(method='tagBuild',
-                arglist=[target_info['dest_tag'], bld_info['id'], False, None, True],
-                label='tag', parent=self.id, arch='noarch')
+                                                    arglist=[target_info['dest_tag'], bld_info['id'], False, None, True],
+                                                    label='tag', parent=self.id, arch='noarch')
             self.wait(tag_task_id)
 
         # report results
@@ -4856,10 +4856,10 @@ class BuildSRPMFromSCMTask(BaseBuildTask):
 
         return {'srpm': "%s/%s" % (uploadpath, srpm_name),
                 'logs': ["%s/%s" % (uploadpath, os.path.basename(f))
-                                        for f in log_files],
+                         for f in log_files],
                 'brootid': brootid,
                 'source': source,
-               }
+                }
 
 class TagNotificationTask(BaseTaskHandler):
     Methods = ['tagNotification']
@@ -4867,7 +4867,7 @@ class TagNotificationTask(BaseTaskHandler):
     _taskWeight = 0.1
 
     message_templ = \
-"""From: %(from_addr)s\r
+        """From: %(from_addr)s\r
 Subject: %(nvr)s %(result)s %(operation)s by %(user_name)s\r
 To: %(to_addrs)s\r
 X-Koji-Package: %(pkg_name)s\r
@@ -4960,7 +4960,7 @@ class BuildNotificationTask(BaseTaskHandler):
     # XXX externalize these templates somewhere
     subject_templ = """Package: %(build_nvr)s Tag: %(dest_tag)s Status: %(status)s Built by: %(build_owner)s"""
     message_templ = \
-"""From: %(from_addr)s\r
+        """From: %(from_addr)s\r
 Subject: %(subject)s\r
 To: %(to_addrs)s\r
 X-Koji-Tag: %(dest_tag)s\r
@@ -5321,20 +5321,20 @@ class CreaterepoTask(BaseTaskHandler):
         status = log_output(self.session, cmd[0], cmd, logfile, self.getUploadDir(), logerror=True)
         if not isSuccess(status):
             raise koji.GenericError('failed to create repo: %s' \
-                    % parseStatus(status, ' '.join(cmd)))
+                                    % parseStatus(status, ' '.join(cmd)))
 
     def merge_repos(self, external_repos, arch, groupdata):
         # group repos by merge type
         repos_by_mode = {}
         for repo in external_repos:
             repos_by_mode.setdefault(
-                    repo.get('merge_mode', 'koji'), []).append(repo)
+                repo.get('merge_mode', 'koji'), []).append(repo)
 
         # figure out merge mode
         if len(repos_by_mode) > 1:
             # TODO: eventually support mixing merge modes
             raise koji.GenericError('Found multiple merge modes for external '
-                    'repos: %s\n' % repos_by_mode.keys())
+                                    'repos: %s\n' % repos_by_mode.keys())
         merge_mode = to_list(repos_by_mode.keys())[0]
 
         # move current repo to the premerge location
@@ -5380,7 +5380,7 @@ class CreaterepoTask(BaseTaskHandler):
         status = log_output(self.session, cmd[0], cmd, logfile, self.getUploadDir(), logerror=True)
         if not isSuccess(status):
             raise koji.GenericError('failed to merge repos: %s' \
-                % parseStatus(status, ' '.join(cmd)))
+                                    % parseStatus(status, ' '.join(cmd)))
 
 
 class NewDistRepoTask(BaseTaskHandler):
@@ -5442,25 +5442,25 @@ class createDistRepoTask(BaseTaskHandler):
 
     archmap = {'s390x': 's390', 'ppc64': 'ppc', 'x86_64': 'i686'}
     compat = {"i386": ("athlon", "i686", "i586", "i486", "i386", "noarch"),
-          "x86_64": ("amd64", "ia32e", "x86_64", "noarch"),
-          "ia64": ("ia64", "noarch"),
-          "ppc": ("ppc", "noarch"),
-          "ppc64": ("ppc64p7", "ppc64pseries", "ppc64iseries", "ppc64", "noarch"),
-          "ppc64le": ("ppc64le", "noarch"),
-          "s390": ("s390", "noarch"),
-          "s390x": ("s390x",  "noarch"),
-          "sparc": ("sparcv9v", "sparcv9", "sparcv8", "sparc", "noarch"),
-          "sparc64": ("sparc64v", "sparc64", "noarch"),
-          "alpha": ("alphaev6", "alphaev56", "alphaev5", "alpha", "noarch"),
-          "arm": ("arm", "armv4l", "armv4tl", "armv5tel", "armv5tejl", "armv6l", "armv7l", "noarch"),
-          "armhfp": ("armv7hl", "armv7hnl", "noarch"),
-          "aarch64": ("aarch64", "noarch"),
-          "riscv64": ("riscv64", "noarch"),
-          "src": ("src",)
-          }
+              "x86_64": ("amd64", "ia32e", "x86_64", "noarch"),
+              "ia64": ("ia64", "noarch"),
+              "ppc": ("ppc", "noarch"),
+              "ppc64": ("ppc64p7", "ppc64pseries", "ppc64iseries", "ppc64", "noarch"),
+              "ppc64le": ("ppc64le", "noarch"),
+              "s390": ("s390", "noarch"),
+              "s390x": ("s390x",  "noarch"),
+              "sparc": ("sparcv9v", "sparcv9", "sparcv8", "sparc", "noarch"),
+              "sparc64": ("sparc64v", "sparc64", "noarch"),
+              "alpha": ("alphaev6", "alphaev56", "alphaev5", "alpha", "noarch"),
+              "arm": ("arm", "armv4l", "armv4tl", "armv5tel", "armv5tejl", "armv6l", "armv7l", "noarch"),
+              "armhfp": ("armv7hl", "armv7hnl", "noarch"),
+              "aarch64": ("aarch64", "noarch"),
+              "riscv64": ("riscv64", "noarch"),
+              "src": ("src",)
+              }
 
     biarch = {"ppc": "ppc64", "x86_64": "i386", "sparc":
-          "sparc64", "s390x": "s390", "ppc64": "ppc"}
+              "sparc64", "s390x": "s390", "ppc64": "ppc"}
 
     def handler(self, tag, repo_id, arch, keys, opts):
         # arch is the arch of the repo, not the task
@@ -5485,7 +5485,7 @@ class createDistRepoTask(BaseTaskHandler):
                 oldrepo = self.session.repoInfo(repo_id, strict=True)
                 if not oldrepo['dist']:
                     raise koji.GenericError("Base repo for deltas must also "
-                            "be a dist repo")
+                                            "be a dist repo")
                     # regular repos don't actually have rpms, just pkglist
                 path = koji.pathinfo.distrepo(repo_id, oldrepo['tag_name'])
                 if not os.path.exists(path):
@@ -5516,18 +5516,18 @@ class createDistRepoTask(BaseTaskHandler):
         if oldrepo:
             oldrepodata = os.path.join(oldrepodir, arch, 'repodata')
         self.do_createrepo(self.repodir, '%s/pkglist' % self.repodir,
-                    groupdata, oldpkgs=oldpkgs, oldrepodata=oldrepodata,
-                    zck=opts.get('zck'), zck_dict_dir=opts.get('zck_dict_dir'))
+                           groupdata, oldpkgs=oldpkgs, oldrepodata=oldrepodata,
+                           zck=opts.get('zck'), zck_dict_dir=opts.get('zck_dict_dir'))
         for subrepo in self.subrepos:
             if oldrepo:
                 oldrepodata = os.path.join(oldrepodir, arch, subrepo, 'repodata')
             self.do_createrepo(
-                    '%s/%s' % (self.repodir, subrepo),
-                    '%s/%s/pkglist' % (self.repodir, subrepo),
-                    groupdata, oldpkgs=oldpkgs, oldrepodata=oldrepodata,
-                    logname='createrepo_%s' % subrepo,
-                    zck=opts.get('zck'),
-                    zck_dict_dir=opts.get('zck_dict_dir'))
+                '%s/%s' % (self.repodir, subrepo),
+                '%s/%s/pkglist' % (self.repodir, subrepo),
+                groupdata, oldpkgs=oldpkgs, oldrepodata=oldrepodata,
+                logname='createrepo_%s' % subrepo,
+                zck=opts.get('zck'),
+                zck_dict_dir=opts.get('zck_dict_dir'))
         if len(self.kojipkgs) == 0:
             fn = os.path.join(self.repodir, "repodata", "EMPTY_REPO")
             with open(fn, 'w') as fp:
@@ -5577,7 +5577,7 @@ class createDistRepoTask(BaseTaskHandler):
         self.session.uploadWrapper(fn, self.uploadpath)
 
     def do_createrepo(self, repodir, pkglist, groupdata, oldpkgs=None,
-            logname=None, oldrepodata=None, zck=False, zck_dict_dir=None):
+                      logname=None, oldrepodata=None, zck=False, zck_dict_dir=None):
         """Run createrepo
 
         This is derived from CreaterepoTask.create_local_repo, but adapted to
@@ -5631,7 +5631,7 @@ class createDistRepoTask(BaseTaskHandler):
         status = log_output(self.session, cmd[0], cmd, logfile, self.getUploadDir(), logerror=True)
         if not isSuccess(status):
             raise koji.GenericError('failed to create repo: %s' \
-                    % parseStatus(status, ' '.join(cmd)))
+                                    % parseStatus(status, ' '.join(cmd)))
 
 
     def do_multilib_dnf(self, arch, ml_arch, conf):
@@ -5649,22 +5649,22 @@ class createDistRepoTask(BaseTaskHandler):
         mlm = multilib.DevelMultilibMethod(ml_conf)
         fs_missing = set()
         for bnp in self.kojipkgs:
-                rpminfo = self.kojipkgs[bnp]
-                ppath = rpminfo['_pkgpath']
-                dnfbase.fill_sack(load_system_repo=False, load_available_repos=False)
-                po = dnfbase.sack.add_cmdline_package(ppath)
-                if mlm.select(po):
-                    # we need a multilib package to be included
-                    ml_bnp = bnp.replace(arch, self.archmap[arch])
-                    ml_path = os.path.join(mldir, ml_bnp[0].lower(), ml_bnp)
-                    # ^ XXX - should actually generate this
-                    if ml_bnp not in ml_pkgs:
-                        # not in our multilib repo
-                        self.logger.error('%s (multilib) is not on the filesystem' % ml_path)
-                        fs_missing.add(ml_path)
-                        # we defer failure so can report all the missing deps
-                        continue
-                    ml_true.add(ml_path)
+            rpminfo = self.kojipkgs[bnp]
+            ppath = rpminfo['_pkgpath']
+            dnfbase.fill_sack(load_system_repo=False, load_available_repos=False)
+            po = dnfbase.sack.add_cmdline_package(ppath)
+            if mlm.select(po):
+                # we need a multilib package to be included
+                ml_bnp = bnp.replace(arch, self.archmap[arch])
+                ml_path = os.path.join(mldir, ml_bnp[0].lower(), ml_bnp)
+                # ^ XXX - should actually generate this
+                if ml_bnp not in ml_pkgs:
+                    # not in our multilib repo
+                    self.logger.error('%s (multilib) is not on the filesystem' % ml_path)
+                    fs_missing.add(ml_path)
+                    # we defer failure so can report all the missing deps
+                    continue
+                ml_true.add(ml_path)
 
         # step 2: set up architectures for dnf configuration
         self.logger.info("Resolving multilib for %s using method devel" % arch)
@@ -5701,7 +5701,7 @@ enabled=1
         with open(yconfig_path, 'w') as f:
             f.write(dnfconfig)
         self.session.uploadWrapper(yconfig_path, self.uploadpath,
-            os.path.basename(yconfig_path))
+                                   os.path.basename(yconfig_path))
         conf = dnf.conf.Conf()
         conf.reposdir = [] # don't use system repos at all
         conf.read(yconfig_path)
@@ -5741,7 +5741,7 @@ enabled=1
                     outfile.write(ml_path + '\n')
             self.session.uploadWrapper(missing_log, self.uploadpath)
             raise koji.GenericError('multilib packages missing. '
-                    'See missing_multilib.log')
+                                    'See missing_multilib.log')
 
         # step 5: update kojipkgs
         for dep_path in ml_needed:
@@ -5775,21 +5775,21 @@ enabled=1
         mlm = multilib.DevelMultilibMethod(ml_conf)
         fs_missing = set()
         for bnp in self.kojipkgs:
-                rpminfo = self.kojipkgs[bnp]
-                ppath = rpminfo['_pkgpath']
-                po = yum.packages.YumLocalPackage(filename=ppath)
-                if mlm.select(po):
-                    # we need a multilib package to be included
-                    ml_bnp = bnp.replace(arch, self.archmap[arch])
-                    ml_path = os.path.join(mldir, ml_bnp[0].lower(), ml_bnp)
-                    # ^ XXX - should actually generate this
-                    if ml_bnp not in ml_pkgs:
-                        # not in our multilib repo
-                        self.logger.error('%s (multilib) is not on the filesystem' % ml_path)
-                        fs_missing.add(ml_path)
-                        # we defer failure so can report all the missing deps
-                        continue
-                    ml_true.add(ml_path)
+            rpminfo = self.kojipkgs[bnp]
+            ppath = rpminfo['_pkgpath']
+            po = yum.packages.YumLocalPackage(filename=ppath)
+            if mlm.select(po):
+                # we need a multilib package to be included
+                ml_bnp = bnp.replace(arch, self.archmap[arch])
+                ml_path = os.path.join(mldir, ml_bnp[0].lower(), ml_bnp)
+                # ^ XXX - should actually generate this
+                if ml_bnp not in ml_pkgs:
+                    # not in our multilib repo
+                    self.logger.error('%s (multilib) is not on the filesystem' % ml_path)
+                    fs_missing.add(ml_path)
+                    # we defer failure so can report all the missing deps
+                    continue
+                ml_true.add(ml_path)
 
         # step 2: set up architectures for yum configuration
         self.logger.info("Resolving multilib for %s using method devel" % arch)
@@ -5833,7 +5833,7 @@ enabled=1
         with open(yconfig_path, 'w') as f:
             f.write(yconfig)
         self.session.uploadWrapper(yconfig_path, self.uploadpath,
-            os.path.basename(yconfig_path))
+                                   os.path.basename(yconfig_path))
         yumbase.doConfigSetup(fn=yconfig_path)
         yumbase.conf.cache = 0
         yumbase.doRepoSetup()
@@ -5875,7 +5875,7 @@ enabled=1
                     outfile.write('\n')
             self.session.uploadWrapper(missing_log, self.uploadpath)
             raise koji.GenericError('multilib packages missing. '
-                    'See missing_multilib.log')
+                                    'See missing_multilib.log')
 
         # step 5: update kojipkgs
         for dep_path in ml_needed:
@@ -5916,8 +5916,8 @@ enabled=1
         for a in self.compat[arch]:
             # note: self.compat includes noarch for non-src already
             rpm_iter, builds = self.session.listTaggedRPMS(tag_id,
-                event=opts['event'], arch=a, latest=opts['latest'],
-                inherit=opts['inherit'], rpmsigs=True)
+                                                           event=opts['event'], arch=a, latest=opts['latest'],
+                                                           inherit=opts['inherit'], rpmsigs=True)
             for build in builds:
                 builddirs[build['id']] = koji.pathinfo.build(build)
             rpms += list(rpm_iter)
@@ -5954,11 +5954,11 @@ enabled=1
                     continue
                 # use the primary copy, if allowed (checked below)
                 pkgpath = '%s/%s' % (builddirs[rpminfo['build_id']],
-                    koji.pathinfo.rpm(rpminfo))
+                                     koji.pathinfo.rpm(rpminfo))
             else:
                 # use the signed copy
                 pkgpath = '%s/%s' % (builddirs[rpminfo['build_id']],
-                    koji.pathinfo.signed(rpminfo, rpminfo['sigkey']))
+                                     koji.pathinfo.signed(rpminfo, rpminfo['sigkey']))
             if not os.path.exists(pkgpath):
                 fs_missing.append(pkgpath)
                 # we'll raise an error below
@@ -5973,14 +5973,14 @@ enabled=1
             missing_log = os.path.join(self.workdir, 'missing_files.log')
             with open(missing_log, 'w') as outfile:
                 outfile.write('Some rpm files were missing.\n'
-                    'Most likely, you want to create these signed copies.\n\n'
-                    'Missing files:\n')
+                              'Most likely, you want to create these signed copies.\n\n'
+                              'Missing files:\n')
                 for pkgpath in sorted(fs_missing):
                     outfile.write(pkgpath)
                     outfile.write('\n')
             self.session.uploadWrapper(missing_log, self.uploadpath)
             raise koji.GenericError('Packages missing from the filesystem. '
-                    'See missing_files.log.')
+                                    'See missing_files.log.')
         if sig_missing:
             # log missing signatures and possibly error
             missing_log = os.path.join(self.workdir, 'missing_signatures.log')
@@ -5988,7 +5988,7 @@ enabled=1
                 outfile.write('Some rpms were missing requested signatures.\n')
                 if opts['skip_missing_signatures']:
                     outfile.write('The skip_missing_signatures option was specified, so '
-                            'these files were excluded.\n')
+                                  'these files were excluded.\n')
                 outfile.write('Acceptable keys: %r\n\n' % keys)
                 outfile.write('# RPM name: available keys\n')
                 fmt = '%(name)s-%(version)s-%(release)s.%(arch)s'
@@ -5998,9 +5998,9 @@ enabled=1
                     outfile.write('%s: %r\n' % (fname, avail))
             self.session.uploadWrapper(missing_log, self.uploadpath)
             if (not opts['skip_missing_signatures']
-                        and not opts['allow_missing_signatures']):
+                    and not opts['allow_missing_signatures']):
                 raise koji.GenericError('Unsigned packages found. See '
-                        'missing_signatures.log')
+                                        'missing_signatures.log')
 
     def link_pkgs(self):
         for bnp in self.kojipkgs:
@@ -6029,7 +6029,7 @@ enabled=1
             if subrepo:
                 # note the ../
                 subrepo_pkgs.setdefault(subrepo, []).append(
-                        '../Packages/%s/%s\n' % (bnplet, bnp))
+                    '../Packages/%s/%s\n' % (bnplet, bnp))
             else:
                 pkgs.append('Packages/%s/%s\n' % (bnplet, bnp))
 
@@ -6097,12 +6097,12 @@ class WaitrepoTask(BaseTaskHandler):
                 if builds:
                     if koji.util.checkForBuilds(self.session, taginfo['id'], builds, repo['create_event']):
                         self.logger.debug("Successfully waited %s for %s to appear in the %s repo" % \
-                            (koji.util.duration(start), koji.util.printList(nvrs), taginfo['name']))
+                                          (koji.util.duration(start), koji.util.printList(nvrs), taginfo['name']))
                         return repo
                 elif newer_than:
                     if repo['create_ts'] > newer_than:
                         self.logger.debug("Successfully waited %s for a new %s repo" % \
-                            (koji.util.duration(start), taginfo['name']))
+                                          (koji.util.duration(start), taginfo['name']))
                         return repo
                 else:
                     # no check requested -- return first ready repo
@@ -6111,10 +6111,10 @@ class WaitrepoTask(BaseTaskHandler):
             if (time.time() - start) > (self.TIMEOUT * 60.0):
                 if builds:
                     raise koji.GenericError("Unsuccessfully waited %s for %s to appear in the %s repo" % \
-                        (koji.util.duration(start), koji.util.printList(nvrs), taginfo['name']))
+                                            (koji.util.duration(start), koji.util.printList(nvrs), taginfo['name']))
                 else:
                     raise koji.GenericError("Unsuccessfully waited %s for a new %s repo" % \
-                        (koji.util.duration(start), taginfo['name']))
+                                            (koji.util.duration(start), taginfo['name']))
 
             time.sleep(self.PAUSE)
             last_repo = repo
@@ -6144,7 +6144,7 @@ def get_options():
     parser.add_option("--debug-xmlrpc", action="store_true", default=False,
                       help="show xmlrpc debug output")
     parser.add_option("--debug-mock", action="store_true", default=False,
-                     # obsolete option
+                      # obsolete option
                       help=SUPPRESS_HELP)
     parser.add_option("--skip-main", action="store_true", default=False,
                       help="don't actually run main")
@@ -6152,7 +6152,7 @@ def get_options():
     parser.add_option("--minspace", type='int', help="Specify minspace")
     parser.add_option("--sleeptime", type='int', help="Specify the polling interval")
     parser.add_option("--admin-emails", type='str', action="store", metavar="EMAILS",
-                       help="Comma-separated addresses to send error notices to.")
+                      help="Comma-separated addresses to send error notices to.")
     parser.add_option("--topdir", help="Specify topdir")
     parser.add_option("--topurl", help="Specify topurl")
     parser.add_option("--workdir", help="Specify workdir")
diff --git a/builder/mergerepos b/builder/mergerepos
index 008dbf49..c50ff383 100755
--- a/builder/mergerepos
+++ b/builder/mergerepos
@@ -49,13 +49,13 @@ EXPAND_ARCHES = {
     'armhfp': ['armv7hl', 'armv7hnl', 'armv6hl', 'armv6hnl'],
     'arm': ['armv5tel', 'armv5tejl', 'armv6l','armv7l'],
     'sh4': ['sh4a']
-    }
+}
 
 MULTILIB_ARCHES = {
     'x86_64': 'i386',
     'ppc64': 'ppc',
     's390x': 's390'
-    }
+}
 
 def parse_args(args):
     """Parse our opts/args"""
@@ -221,13 +221,13 @@ class RepoMerge(object):
                         # We found a rpm built from an srpm with the same name in a previous repo.
                         # The previous repo takes precedence, so ignore the srpm found here.
                         sys.stderr.write('Package %s already provided by repo %s'
-                                ' (at %s in repo %s)\n'
-                                % (srpm_name, other_repoid, str(pkg), pkg.repoid))
+                                         ' (at %s in repo %s)\n'
+                                         % (srpm_name, other_repoid, str(pkg), pkg.repoid))
                         continue
                     else:
                         # We're in the same repo, so compare srpm NVRs
                         other_srpm_name, other_ver, other_rel, other_epoch, other_arch = \
-                                         rpmUtils.miscutils.splitFilename(other_srpm)
+                            rpmUtils.miscutils.splitFilename(other_srpm)
                         cmp = rpmUtils.miscutils.compareEVR((epoch, ver, rel),
                                                             (other_epoch, other_ver, other_rel))
                         if cmp > 0:
@@ -235,10 +235,10 @@ class RepoMerge(object):
                             # existing srpm in the dict, so update the dict
                             include_srpms[srpm_name] = (pkg.sourcerpm, pkg.repoid)
                             sys.stderr.write('Replacing older source nvr: '
-                                    '%s > %s\n' % (pkg.sourcerpm, other_srpm))
+                                             '%s > %s\n' % (pkg.sourcerpm, other_srpm))
                         elif cmp < 0:
                             sys.stderr.write('Ignoring older source nvr: '
-                                    '%s < %s\n' % (pkg.sourcerpm, other_srpm))
+                                             '%s < %s\n' % (pkg.sourcerpm, other_srpm))
                         # otherwise same, so we already have it
                 elif srpm_name in self.blocked:
                     sys.stderr.write('Ignoring blocked package: %s\n\n' % \
@@ -260,14 +260,14 @@ class RepoMerge(object):
                     sys.stderr.write('Duplicate rpm: %s\n' % pkg_nvra)
                 elif incl_srpm is None:
                     sys.stderr.write('Excluding %s (%s is blocked)\n'
-                            % (pkg_nvra, srpm_name))
+                                     % (pkg_nvra, srpm_name))
                     repo.sack.delPackage(pkg)
                 elif incl_srpm == pkg.sourcerpm:
                     origins.write('%s\t%s\n' % (pkg_nvra, repo.urls[0]))
                     seen_rpms[pkg_nvra] = 1
                 else:
                     sys.stderr.write('Excluding %s (wrong srpm version '
-                            '%s != %s)\n' % (pkg_nvra, pkg.sourcerpm, incl_srpm))
+                                     '%s != %s)\n' % (pkg_nvra, pkg.sourcerpm, incl_srpm))
                     repo.sack.delPackage(pkg)
 
         origins.close()
diff --git a/cli/koji b/cli/koji
index f97e4de5..bb41ee98 100755
--- a/cli/koji
+++ b/cli/koji
@@ -104,7 +104,7 @@ def get_options():
     common_commands = ['build', 'help', 'download-build',
                        'latest-build', 'search', 'list-targets']
     usage = _("%%prog [global-options] command [command-options-and-arguments]"
-                "\n\nCommon commands: %s" % ', '.join(sorted(common_commands)))
+              "\n\nCommon commands: %s" % ', '.join(sorted(common_commands)))
     parser = OptionParser(usage=usage)
     parser.disable_interspersed_args()
     progname = os.path.basename(sys.argv[0]) or 'koji'
@@ -144,7 +144,7 @@ def get_options():
     parser.add_option("--topurl", help=_("url for Koji file access"))
     parser.add_option("--pkgurl", help=SUPPRESS_HELP)
     parser.add_option("--plugin-paths", metavar='PATHS',
-            help=_("specify additional plugin paths (colon separated)"))
+                      help=_("specify additional plugin paths (colon separated)"))
     parser.add_option("--help-commands", action="store_true", default=False, help=_("list commands"))
     (options, args) = parser.parse_args()
 
diff --git a/cli/koji_cli/commands.py b/cli/koji_cli/commands.py
index f41b5730..eae53936 100644
--- a/cli/koji_cli/commands.py
+++ b/cli/koji_cli/commands.py
@@ -149,7 +149,7 @@ def handle_assign_task(goptions, session, args):
     usage = _('usage: %prog assign-task <task_id> <hostname>')
     parser = OptionParser(usage=get_usage_str(usage))
     parser.add_option('-f', '--force', action='store_true', default=False,
-                          help=_('force to assign a non-free task'))
+                      help=_('force to assign a non-free task'))
     (options, args) = parser.parse_args(args)
 
     if len(args) != 2:
@@ -457,9 +457,9 @@ def handle_build(options, session, args):
     parser.add_option("--nowait", action="store_false", dest="wait",
                       help=_("Don't wait on build"))
     parser.add_option("--wait-repo", action="store_true",
-                       help=_("Wait for the actual buildroot repo of given target"))
+                      help=_("Wait for the actual buildroot repo of given target"))
     parser.add_option("--wait-build", metavar="NVR", action="append", dest="wait_builds",
-                       default=[], help=_("Wait for the given nvr to appear in buildroot repo"))
+                      default=[], help=_("Wait for the given nvr to appear in buildroot repo"))
     parser.add_option("--quiet", action="store_true",
                       help=_("Do not print the task information"), default=options.quiet)
     parser.add_option("--arch-override", help=_("Override build arches"))
@@ -521,7 +521,7 @@ def handle_build(options, session, args):
     if build_opts.wait or (build_opts.wait is None and not _running_in_bg()):
         session.logout()
         return watch_tasks(session, [task_id], quiet=build_opts.quiet,
-                poll_interval=options.poll_interval)
+                           poll_interval=options.poll_interval)
     else:
         return
 
@@ -598,7 +598,7 @@ def handle_chain_build(options, session, args):
     else:
         session.logout()
         return watch_tasks(session, [task_id], quiet=build_opts.quiet,
-                poll_interval=options.poll_interval)
+                           poll_interval=options.poll_interval)
 
 
 def handle_maven_build(options, session, args):
@@ -697,7 +697,7 @@ def handle_maven_build(options, session, args):
     else:
         session.logout()
         return watch_tasks(session, [task_id], quiet=build_opts.quiet,
-                poll_interval=options.poll_interval)
+                           poll_interval=options.poll_interval)
 
 
 def handle_wrapper_rpm(options, session, args):
@@ -764,7 +764,7 @@ def handle_wrapper_rpm(options, session, args):
     else:
         session.logout()
         return watch_tasks(session, [task_id], quiet=options.quiet,
-                poll_interval=options.poll_interval)
+                           poll_interval=options.poll_interval)
 
 
 def handle_maven_chain(options, session, args):
@@ -816,7 +816,7 @@ def handle_maven_chain(options, session, args):
     else:
         session.logout()
         return watch_tasks(session, [task_id], quiet=options.quiet,
-                poll_interval=options.poll_interval)
+                           poll_interval=options.poll_interval)
 
 
 def handle_resubmit(goptions, session, args):
@@ -825,9 +825,9 @@ def handle_resubmit(goptions, session, args):
     parser = OptionParser(usage=get_usage_str(usage))
     parser.add_option("--nowait", action="store_true", help=_("Don't wait on task"))
     parser.add_option("--nowatch", action="store_true", dest="nowait",
-            help=_("An alias for --nowait"))
+                      help=_("An alias for --nowait"))
     parser.add_option("--quiet", action="store_true", default=goptions.quiet,
-            help=_("Do not print the task information"))
+                      help=_("Do not print the task information"))
     (options, args) = parser.parse_args(args)
     if len(args) != 1:
         parser.error(_("Please specify a single task ID"))
@@ -844,7 +844,7 @@ def handle_resubmit(goptions, session, args):
     else:
         session.logout()
         return watch_tasks(session, [newID], quiet=options.quiet,
-                poll_interval=goptions.poll_interval)
+                           poll_interval=goptions.poll_interval)
 
 
 def handle_call(goptions, session, args):
@@ -1104,7 +1104,7 @@ def handle_restart_hosts(options, session, args):
             'method': 'restartHosts',
             'state':
                 [koji.TASK_STATES[s] for s in ('FREE', 'OPEN', 'ASSIGNED')],
-            }
+        }
         others = session.listTasks(query)
         if others:
             print('Found other restartHosts tasks running.')
@@ -1127,7 +1127,7 @@ def handle_restart_hosts(options, session, args):
     if my_opts.wait or (my_opts.wait is None and not _running_in_bg()):
         session.logout()
         return watch_tasks(session, [task_id], quiet=my_opts.quiet,
-                poll_interval=options.poll_interval)
+                           poll_interval=options.poll_interval)
     else:
         return
 
@@ -1154,7 +1154,7 @@ def handle_import(goptions, session, args):
     to_import = {}
     for path in args:
         data = koji.get_header_fields(path, ('name','version','release','epoch',
-                                    'arch','sigmd5','sourcepackage','sourcerpm'))
+                                             'arch','sigmd5','sourcepackage','sourcerpm'))
         if data['sourcepackage']:
             data['arch'] = 'src'
             nvr = "%(name)s-%(version)s-%(release)s" % data
@@ -1190,7 +1190,7 @@ def handle_import(goptions, session, args):
                 print(_("WARNING: md5sum mismatch for %s") % path)
                 print(_("  A different rpm with the same name has already been imported"))
                 print(_("  Existing sigmd5 is %r, your import has %r") % (
-                        prev['payloadhash'], koji.hex_string(data['sigmd5'])))
+                    prev['payloadhash'], koji.hex_string(data['sigmd5'])))
             print(_("Skipping import"))
             return
         if options.test:
@@ -1371,16 +1371,16 @@ def _import_comps(session, filename, tag, options):
     for group in comps.groups:
         print("Group: %s (%s)" % (group.id, group.name))
         session.groupListAdd(
-                    tag, group.id, force=force, display_name=group.name,
-                    is_default=bool(group.default),
-                    uservisible=bool(group.uservisible),
-                    description=group.desc,
-                    langonly=group.lang_only,
-                    biarchonly=bool(group.biarchonly))
+            tag, group.id, force=force, display_name=group.name,
+            is_default=bool(group.default),
+            uservisible=bool(group.uservisible),
+            description=group.desc,
+            langonly=group.lang_only,
+            biarchonly=bool(group.biarchonly))
         for pkg in group.packages:
             pkgopts = {'type' : ptypes[pkg.type],
-                        'basearchonly' : bool(pkg.basearchonly),
-                        }
+                       'basearchonly' : bool(pkg.basearchonly),
+                       }
             if pkg.type == libcomps.PACKAGE_TYPE_CONDITIONAL:
                 pkgopts['requires'] = pkg.requires
             for k in pkgopts.keys():
@@ -1402,10 +1402,10 @@ def _import_comps_alt(session, filename, tag, options): # no cover 3.x
     for group in comps.groups:
         print("Group: %(groupid)s (%(name)s)" % vars(group))
         session.groupListAdd(tag, group.groupid, force=force, display_name=group.name,
-                        is_default=bool(group.default),
-                        uservisible=bool(group.user_visible),
-                        description=group.description,
-                        langonly=group.langonly)
+                             is_default=bool(group.default),
+                             uservisible=bool(group.user_visible),
+                             description=group.description,
+                             langonly=group.langonly)
         # yum.comps does not support the biarchonly field
         for ptype, pdata in [('mandatory', group.mandatory_packages),
                              ('default', group.default_packages),
@@ -1704,7 +1704,7 @@ def handle_prune_signed_copies(options, session, args):
                     # we were still tagged here sometime before the cutoff
                     if options.debug:
                         print("Build %s had protected tag %s until %s" \
-                                % (nvr, tag_name, time.asctime(time.localtime(our_entry['revoke_ts']))))
+                              % (nvr, tag_name, time.asctime(time.localtime(our_entry['revoke_ts']))))
                     is_protected = True
                     break
             replaced_ts = None
@@ -1722,7 +1722,7 @@ def handle_prune_signed_copies(options, session, args):
                     if is_create:
                         # shouldn't happen
                         raise koji.GenericError("Duplicate creation event found for %s in %s" \
-                                                    % (nvr, tag_name))
+                                                % (nvr, tag_name))
                     else:
                         # we've been revoked
                         revoke_ts = entry['revoke_ts']
@@ -1763,20 +1763,20 @@ def handle_prune_signed_copies(options, session, args):
                     timestamps.append(replaced_ts)
                     if options.debug:
                         print("tag %s: %s not latest (replaced %s)" \
-                                % (tag_name, nvr, time.asctime(time.localtime(replaced_ts))))
+                              % (tag_name, nvr, time.asctime(time.localtime(replaced_ts))))
             elif replaced_ts is None:
                 # revoked but not replaced
                 timestamps.append(revoke_ts)
                 if options.debug:
                     print("tag %s: %s not latest (revoked %s)" \
-                            % (tag_name, nvr, time.asctime(time.localtime(revoke_ts))))
+                          % (tag_name, nvr, time.asctime(time.localtime(revoke_ts))))
             else:
                 # revoked AND replaced
                 timestamps.append(min(revoke_ts, replaced_ts))
                 if options.debug:
                     print("tag %s: %s not latest (revoked %s, replaced %s)" \
-                            % (tag_name, nvr, time.asctime(time.localtime(revoke_ts)),
-                                time.asctime(time.localtime(replaced_ts))))
+                          % (tag_name, nvr, time.asctime(time.localtime(revoke_ts)),
+                             time.asctime(time.localtime(replaced_ts))))
             last_latest = max(timestamps)
             if last_latest > cutoff_ts:
                 if options.debug:
@@ -1867,7 +1867,7 @@ def handle_prune_signed_copies(options, session, args):
             total_space += build_space
             if options.verbose:
                 print("Build: %s, Removed %i signed copies (%i bytes). Total: %i/%i" \
-                        % (nvr, build_files, build_space, total_files, total_space))
+                      % (nvr, build_files, build_space, total_files, total_space))
         elif options.debug and by_sig:
             print("(build has no signed copies)")
     print("--- Grand Totals ---")
@@ -2300,7 +2300,7 @@ def anon_handle_latest_build(goptions, session, args):
     parser.add_option("--arch", help=_("List all of the latest packages for this arch"))
     parser.add_option("--all", action="store_true", help=_("List all of the latest packages for this tag"))
     parser.add_option("--quiet", action="store_true", default=goptions.quiet,
-                help=_("Do not print the header information"))
+                      help=_("Do not print the header information"))
     parser.add_option("--paths", action="store_true", help=_("Show the file paths"))
     parser.add_option("--type", help=_("Show builds of the given type only.  Currently supported types: maven"))
     (options, args) = parser.parse_args(args)
@@ -2401,7 +2401,7 @@ def anon_handle_list_tagged(goptions, session, args):
     parser.add_option("--latest", action="store_true", help=_("Only show the latest builds/rpms"))
     parser.add_option("--latest-n", type='int', metavar="N", help=_("Only show the latest N builds/rpms"))
     parser.add_option("--quiet", action="store_true", default=goptions.quiet,
-                help=_("Do not print the header information"))
+                      help=_("Do not print the header information"))
     parser.add_option("--paths", action="store_true", help=_("Show the file paths"))
     parser.add_option("--sigs", action="store_true", help=_("Show signatures"))
     parser.add_option("--type", help=_("Show builds of the given type only.  Currently supported types: maven, win, image"))
@@ -2733,9 +2733,9 @@ def anon_handle_list_channels(goptions, session, args):
     usage = _("usage: %prog list-channels")
     parser = OptionParser(usage=get_usage_str(usage))
     parser.add_option("--simple", action="store_true", default=False,
-                help=_("Print just list of channels without additional info"))
+                      help=_("Print just list of channels without additional info"))
     parser.add_option("--quiet", action="store_true", default=goptions.quiet,
-                help=_("Do not print header information"))
+                      help=_("Do not print header information"))
     (options, args) = parser.parse_args(args)
     activate_session(session, goptions)
     channels = session.listChannels()
@@ -2777,7 +2777,7 @@ def anon_handle_list_hosts(goptions, session, args):
     parser.add_option("--not-enabled", action="store_false", dest="enabled", help=_("Limit to not enabled hosts"))
     parser.add_option("--disabled", action="store_false", dest="enabled", help=_("Alias for --not-enabled"))
     parser.add_option("--quiet", action="store_true", default=goptions.quiet,
-                help=_("Do not print header information"))
+                      help=_("Do not print header information"))
     parser.add_option("--show-channels", action="store_true", help=_("Show host's channels"))
     (options, args) = parser.parse_args(args)
     opts = {}
@@ -2848,7 +2848,7 @@ def anon_handle_list_pkgs(goptions, session, args):
     parser.add_option("--tag", help=_("Specify tag"))
     parser.add_option("--package", help=_("Specify package"))
     parser.add_option("--quiet", action="store_true", default=goptions.quiet,
-                help=_("Do not print header information"))
+                      help=_("Do not print header information"))
     parser.add_option("--noinherit", action="store_true", help=_("Don't follow inheritance"))
     parser.add_option("--show-blocked", action="store_true", help=_("Show blocked packages"))
     parser.add_option("--show-dups", action="store_true", help=_("Show superseded owners"))
@@ -2945,7 +2945,7 @@ def anon_handle_list_builds(goptions, session, args):
     parser.add_option("-r", "--reverse", action="store_true", default=False,
                       help=_("Print the list in reverse order"))
     parser.add_option("--quiet", action="store_true", default=goptions.quiet,
-                help=_("Do not print the header information"))
+                      help=_("Do not print the header information"))
     (options, args) = parser.parse_args(args)
     if len(args) != 0:
         parser.error(_("This command takes no arguments"))
@@ -3265,35 +3265,35 @@ def handle_clone_tag(goptions, session, args):
     usage += _("\nclone-tag will create the destination tag if it does not already exist")
     parser = OptionParser(usage=get_usage_str(usage))
     parser.add_option('--config', action='store_true',
-            help=_("Copy config from the source to the dest tag"))
+                      help=_("Copy config from the source to the dest tag"))
     parser.add_option('--groups', action='store_true',
-            help=_("Copy group information"))
+                      help=_("Copy group information"))
     parser.add_option('--pkgs', action='store_true',
-            help=_("Copy package list from the source to the dest tag"))
+                      help=_("Copy package list from the source to the dest tag"))
     parser.add_option('--builds', action='store_true',
-            help=_("Tag builds into the dest tag"))
+                      help=_("Tag builds into the dest tag"))
     parser.add_option('--all', action='store_true',
-            help=_("The same as --config --groups --pkgs --builds"))
+                      help=_("The same as --config --groups --pkgs --builds"))
     parser.add_option('--latest-only', action='store_true',
-            help=_("Tag only the latest build of each package"))
+                      help=_("Tag only the latest build of each package"))
     parser.add_option('--inherit-builds', action='store_true',
-            help=_("Include all builds inherited into the source tag into "
-                   "the dest tag"))
+                      help=_("Include all builds inherited into the source tag into "
+                             "the dest tag"))
     parser.add_option('--ts', type='int', metavar="TIMESTAMP",
-            help=_('Clone tag at last event before specific timestamp'))
+                      help=_('Clone tag at last event before specific timestamp'))
     parser.add_option('--event', type='int',
-            help=_('Clone tag at a specific event'))
+                      help=_('Clone tag at a specific event'))
     parser.add_option('--repo', type='int',
-            help=_('Clone tag at a specific repo event'))
+                      help=_('Clone tag at a specific repo event'))
     parser.add_option("-v", "--verbose", action="store_true",
-            help=_("show changes"))
+                      help=_("show changes"))
     parser.add_option("--notify", action="store_true", default=False,
-            help=_('Send tagging/untagging notifications'))
+                      help=_('Send tagging/untagging notifications'))
     parser.add_option("-f", "--force", action="store_true",
-            help=_("override tag locks if necessary"))
+                      help=_("override tag locks if necessary"))
     parser.add_option("-n", "--test", action="store_true", help=_("test mode"))
     parser.add_option("--batch", type='int', default=1000, metavar='SIZE',
-            help=_("batch size of multicalls [0 to disable, default: %default]"))
+                      help=_("batch size of multicalls [0 to disable, default: %default]"))
     (options, args) = parser.parse_args(args)
 
     if len(args) != 2:
@@ -3866,7 +3866,7 @@ def anon_handle_list_targets(goptions, session, args):
     parser = OptionParser(usage=get_usage_str(usage))
     parser.add_option("--name", help=_("Specify the build target name"))
     parser.add_option("--quiet", action="store_true", default=goptions.quiet,
-                help=_("Do not print the header information"))
+                      help=_("Do not print the header information"))
     (options, args) = parser.parse_args(args)
     if len(args) != 0:
         parser.error(_("This command takes no arguments"))
@@ -4329,7 +4329,7 @@ _table_keys = {
     'group_config' : ['group_id', 'tag_id'],
     'group_req_listing' : ['group_id', 'tag_id', 'req_id'],
     'group_package_listing' : ['group_id', 'tag_id', 'package'],
-    }
+}
 
 
 def anon_handle_list_history(goptions, session, args):
@@ -4356,7 +4356,7 @@ def anon_handle_list_history(goptions, session, args):
     parser.add_option("--watch", action="store_true", help=_("Monitor history data"))
     parser.add_option("--active", action='store_true', help=_("Only show entries that are currently active"))
     parser.add_option("--revoked", action='store_false', dest='active',
-                            help=_("Only show entries that are currently revoked"))
+                      help=_("Only show entries that are currently revoked"))
     parser.add_option("--context", action="store_true", help=_("Show related entries"))
     parser.add_option("-s", "--show", action="append", help=_("Show data from selected tables"))
     parser.add_option("-v", "--verbose", action="store_true", help=_("Show more detail"))
@@ -4660,12 +4660,12 @@ def _printTaskInfo(session, task_id, topdir, level=0, recurse=True, verbose=True
     for filename in files:
         if filename.endswith('.log'):
             logs += [os.path.join(koji.pathinfo.work(volume=volume),
-                     koji.pathinfo.taskrelpath(task_id),
-                     filename) for volume in files[filename]]
+                                  koji.pathinfo.taskrelpath(task_id),
+                                  filename) for volume in files[filename]]
         else:
             output += [os.path.join(koji.pathinfo.work(volume=volume),
-                       koji.pathinfo.taskrelpath(task_id),
-                       filename) for volume in files[filename]]
+                                    koji.pathinfo.taskrelpath(task_id),
+                                    filename) for volume in files[filename]]
 
     owner = session.getUser(info['owner'])['name']
 
@@ -5035,7 +5035,7 @@ def handle_add_tag_inheritance(goptions, session, args):
 
     if sameParents and not options.force:
         print(_("Error: You are attempting to add %s as %s's parent even though it already is %s's parent.")
-                    % (parent['name'], tag['name'], tag['name']))
+              % (parent['name'], tag['name'], tag['name']))
         print(_("Please use --force if this is what you really want to do."))
         return
     if samePriority:
@@ -5244,7 +5244,7 @@ def anon_handle_list_external_repos(goptions, session, args):
     parser.add_option("--event", type='int', metavar="EVENT#", help=_("Query at event"))
     parser.add_option("--ts", type='int', metavar="TIMESTAMP", help=_("Query at last event before timestamp"))
     parser.add_option("--repo", type='int', metavar="REPO#",
-                            help=_("Query at event corresponding to (nonexternal) repo"))
+                      help=_("Query at event corresponding to (nonexternal) repo"))
     parser.add_option("--quiet", action="store_true", default=goptions.quiet,
                       help=_("Do not display the column headers"))
     (options, args) = parser.parse_args(args)
@@ -5372,7 +5372,7 @@ def handle_add_external_repo(goptions, session, args):
                 callopts['merge_mode'] = options.mode
             session.addExternalRepoToTag(tag, rinfo['name'], priority, **callopts)
             print("Added external repo %s to tag %s (priority %i)" \
-                    % (rinfo['name'], tag, priority))
+                  % (rinfo['name'], tag, priority))
 
 
 def handle_edit_external_repo(goptions, session, args):
@@ -5443,27 +5443,27 @@ def handle_spin_livecd(options, session, args):
               " <arch> <kickstart-file>")
     parser = OptionParser(usage=get_usage_str(usage))
     parser.add_option("--wait", action="store_true",
-        help=_("Wait on the livecd creation, even if running in the background"))
+                      help=_("Wait on the livecd creation, even if running in the background"))
     parser.add_option("--nowait", action="store_false", dest="wait",
-        help=_("Don't wait on livecd creation"))
+                      help=_("Don't wait on livecd creation"))
     parser.add_option("--noprogress", action="store_true",
-        help=_("Do not display progress of the upload"))
+                      help=_("Do not display progress of the upload"))
     parser.add_option("--background", action="store_true",
-        help=_("Run the livecd creation task at a lower priority"))
+                      help=_("Run the livecd creation task at a lower priority"))
     parser.add_option("--ksurl", metavar="SCMURL",
-        help=_("The URL to the SCM containing the kickstart file"))
+                      help=_("The URL to the SCM containing the kickstart file"))
     parser.add_option("--ksversion", metavar="VERSION",
-        help=_("The syntax version used in the kickstart file"))
+                      help=_("The syntax version used in the kickstart file"))
     parser.add_option("--scratch", action="store_true",
-        help=_("Create a scratch LiveCD image"))
+                      help=_("Create a scratch LiveCD image"))
     parser.add_option("--repo", action="append",
-        help=_("Specify a repo that will override the repo used to install " +
-               "RPMs in the LiveCD. May be used multiple times. The " +
-               "build tag repo associated with the target is the default."))
+                      help=_("Specify a repo that will override the repo used to install " +
+                             "RPMs in the LiveCD. May be used multiple times. The " +
+                             "build tag repo associated with the target is the default."))
     parser.add_option("--release", help=_("Forcibly set the release field"))
     parser.add_option("--volid", help=_("Set the volume id"))
     parser.add_option("--specfile", metavar="URL",
-        help=_("SCM URL to spec file fragment to use to generate wrapper RPMs"))
+                      help=_("SCM URL to spec file fragment to use to generate wrapper RPMs"))
     parser.add_option("--skip-tag", action="store_true",
                       help=_("Do not attempt to tag package"))
     (task_options, args) = parser.parse_args(args)
@@ -5488,34 +5488,34 @@ def handle_spin_livemedia(options, session, args):
               " <arch> <kickstart-file>")
     parser = OptionParser(usage=get_usage_str(usage))
     parser.add_option("--wait", action="store_true",
-        help=_("Wait on the livemedia creation, even if running in the background"))
+                      help=_("Wait on the livemedia creation, even if running in the background"))
     parser.add_option("--nowait", action="store_false", dest="wait",
-        help=_("Don't wait on livemedia creation"))
+                      help=_("Don't wait on livemedia creation"))
     parser.add_option("--noprogress", action="store_true",
-        help=_("Do not display progress of the upload"))
+                      help=_("Do not display progress of the upload"))
     parser.add_option("--background", action="store_true",
-        help=_("Run the livemedia creation task at a lower priority"))
+                      help=_("Run the livemedia creation task at a lower priority"))
     parser.add_option("--ksurl", metavar="SCMURL",
-        help=_("The URL to the SCM containing the kickstart file"))
+                      help=_("The URL to the SCM containing the kickstart file"))
     parser.add_option("--install-tree-url", metavar="URL",
-        help=_("Provide the URL for the install tree"))
+                      help=_("Provide the URL for the install tree"))
     parser.add_option("--ksversion", metavar="VERSION",
-        help=_("The syntax version used in the kickstart file"))
+                      help=_("The syntax version used in the kickstart file"))
     parser.add_option("--scratch", action="store_true",
-        help=_("Create a scratch LiveMedia image"))
+                      help=_("Create a scratch LiveMedia image"))
     parser.add_option("--repo", action="append",
-        help=_("Specify a repo that will override the repo used to install " +
-               "RPMs in the LiveMedia. May be used multiple times. The " +
-               "build tag repo associated with the target is the default."))
+                      help=_("Specify a repo that will override the repo used to install " +
+                             "RPMs in the LiveMedia. May be used multiple times. The " +
+                             "build tag repo associated with the target is the default."))
     parser.add_option("--release", help=_("Forcibly set the release field"))
     parser.add_option("--volid", help=_("Set the volume id"))
     parser.add_option("--specfile", metavar="URL",
-        help=_("SCM URL to spec file fragment to use to generate wrapper RPMs"))
+                      help=_("SCM URL to spec file fragment to use to generate wrapper RPMs"))
     parser.add_option("--skip-tag", action="store_true",
                       help=_("Do not attempt to tag package"))
     parser.add_option("--can-fail", action="store", dest="optional_arches",
-        metavar="ARCH1,ARCH2,...", default="",
-        help=_("List of archs which are not blocking for build (separated by commas."))
+                      metavar="ARCH1,ARCH2,...", default="",
+                      help=_("List of archs which are not blocking for build (separated by commas."))
     parser.add_option('--lorax_dir', metavar='DIR',
                       help=_('The relative path to the lorax templates '
                              'directory within the checkout of "lorax_url".'))
@@ -5548,37 +5548,37 @@ def handle_spin_appliance(options, session, args):
               "<target> <arch> <kickstart-file>")
     parser = OptionParser(usage=get_usage_str(usage))
     parser.add_option("--wait", action="store_true",
-        help=_("Wait on the appliance creation, even if running in the background"))
+                      help=_("Wait on the appliance creation, even if running in the background"))
     parser.add_option("--nowait", action="store_false", dest="wait",
-        help=_("Don't wait on appliance creation"))
+                      help=_("Don't wait on appliance creation"))
     parser.add_option("--noprogress", action="store_true",
-        help=_("Do not display progress of the upload"))
+                      help=_("Do not display progress of the upload"))
     parser.add_option("--background", action="store_true",
-        help=_("Run the appliance creation task at a lower priority"))
+                      help=_("Run the appliance creation task at a lower priority"))
     parser.add_option("--ksurl", metavar="SCMURL",
-        help=_("The URL to the SCM containing the kickstart file"))
+                      help=_("The URL to the SCM containing the kickstart file"))
     parser.add_option("--ksversion", metavar="VERSION",
-        help=_("The syntax version used in the kickstart file"))
+                      help=_("The syntax version used in the kickstart file"))
     parser.add_option("--scratch", action="store_true",
-        help=_("Create a scratch appliance"))
+                      help=_("Create a scratch appliance"))
     parser.add_option("--repo", action="append",
-        help=_("Specify a repo that will override the repo used to install " +
-               "RPMs in the appliance. May be used multiple times. The " +
-               "build tag repo associated with the target is the default."))
+                      help=_("Specify a repo that will override the repo used to install " +
+                             "RPMs in the appliance. May be used multiple times. The " +
+                             "build tag repo associated with the target is the default."))
     parser.add_option("--release", help=_("Forcibly set the release field"))
     parser.add_option("--specfile", metavar="URL",
-        help=_("SCM URL to spec file fragment to use to generate wrapper RPMs"))
+                      help=_("SCM URL to spec file fragment to use to generate wrapper RPMs"))
     parser.add_option("--skip-tag", action="store_true",
                       help=_("Do not attempt to tag package"))
     parser.add_option("--vmem", metavar="VMEM", default=None,
-        help=_("Set the amount of virtual memory in the appliance in MB, " +
-               "default is 512"))
+                      help=_("Set the amount of virtual memory in the appliance in MB, " +
+                             "default is 512"))
     parser.add_option("--vcpu", metavar="VCPU", default=None,
-        help=_("Set the number of virtual cpus in the appliance, " +
-               "default is 1"))
+                      help=_("Set the number of virtual cpus in the appliance, " +
+                             "default is 1"))
     parser.add_option("--format", metavar="DISK_FORMAT", default='raw',
-        help=_("Disk format, default is raw. Other options are qcow, " +
-               "qcow2, and vmx."))
+                      help=_("Disk format, default is raw. Other options are qcow, " +
+                             "qcow2, and vmx."))
 
     (task_options, args) = parser.parse_args(args)
 
@@ -5598,42 +5598,42 @@ def handle_image_build_indirection(options, session, args):
     usage += _("\n       %prog image-build --config <FILE>\n")
     parser = OptionParser(usage=get_usage_str(usage))
     parser.add_option("--config",
-        help=_("Use a configuration file to define image-build options " +
-               "instead of command line options (they will be ignored)."))
+                      help=_("Use a configuration file to define image-build options " +
+                             "instead of command line options (they will be ignored)."))
     parser.add_option("--background", action="store_true",
-        help=_("Run the image creation task at a lower priority"))
+                      help=_("Run the image creation task at a lower priority"))
     parser.add_option("--name",
-         help=_("Name of the output image"))
+                      help=_("Name of the output image"))
     parser.add_option("--version",
-         help=_("Version of the output image"))
+                      help=_("Version of the output image"))
     parser.add_option("--release",
-         help=_("Release of the output image"))
+                      help=_("Release of the output image"))
     parser.add_option("--arch",
-         help=_("Architecture of the output image and input images"))
+                      help=_("Architecture of the output image and input images"))
     parser.add_option("--target",
-         help=_("Build target to use for the indirection build"))
+                      help=_("Build target to use for the indirection build"))
     parser.add_option("--skip-tag", action="store_true",
-         help=_("Do not tag the resulting build"))
+                      help=_("Do not tag the resulting build"))
     parser.add_option("--base-image-task",
-         help=_("ID of the createImage task of the base image to be used"))
+                      help=_("ID of the createImage task of the base image to be used"))
     parser.add_option("--base-image-build",
-         help=_("NVR or build ID of the base image to be used"))
+                      help=_("NVR or build ID of the base image to be used"))
     parser.add_option("--utility-image-task",
-         help=_("ID of the createImage task of the utility image to be used"))
+                      help=_("ID of the createImage task of the utility image to be used"))
     parser.add_option("--utility-image-build",
-         help=_("NVR or build ID of the utility image to be used"))
+                      help=_("NVR or build ID of the utility image to be used"))
     parser.add_option("--indirection-template",
-        help=_("Name of the local file, or SCM file containing the template used to drive the indirection plugin"))
+                      help=_("Name of the local file, or SCM file containing the template used to drive the indirection plugin"))
     parser.add_option("--indirection-template-url",
-        help=_("SCM URL containing the template used to drive the indirection plugin"))
+                      help=_("SCM URL containing the template used to drive the indirection plugin"))
     parser.add_option("--results-loc",
-        help=_("Relative path inside the working space image where the results should be extracted from"))
+                      help=_("Relative path inside the working space image where the results should be extracted from"))
     parser.add_option("--scratch", action="store_true",
-        help=_("Create a scratch image"))
+                      help=_("Create a scratch image"))
     parser.add_option("--wait", action="store_true",
-        help=_("Wait on the image creation, even if running in the background"))
+                      help=_("Wait on the image creation, even if running in the background"))
     parser.add_option("--noprogress", action="store_true",
-        help=_("Do not display progress of the upload"))
+                      help=_("Do not display progress of the upload"))
 
 
     (task_options, args) = parser.parse_args(args)
@@ -5689,7 +5689,7 @@ def _build_image_indirection(options, task_opts, session, args):
     dest_tag = session.getTag(tmp_target['dest_tag'])
     if not dest_tag:
         raise koji.GenericError(_("Unknown destination tag: %s" %
-                                   tmp_target['dest_tag_name']))
+                                  tmp_target['dest_tag_name']))
 
     # Set the architecture
     task_opts.arch = koji.canonArch(task_opts.arch)
@@ -5705,7 +5705,7 @@ def _build_image_indirection(options, task_opts, session, args):
         serverdir = unique_path('cli-image-indirection')
         session.uploadWrapper(templatefile, serverdir, callback=callback)
         task_opts.indirection_template = os.path.join('work', serverdir,
-            os.path.basename(templatefile))
+                                                      os.path.basename(templatefile))
         print('')
 
     hub_opts = { }
@@ -5741,57 +5741,57 @@ def handle_image_build(options, session, args):
     usage += _("\n       %prog image-build --config <FILE>\n")
     parser = OptionParser(usage=get_usage_str(usage))
     parser.add_option("--background", action="store_true",
-        help=_("Run the image creation task at a lower priority"))
+                      help=_("Run the image creation task at a lower priority"))
     parser.add_option("--config",
-        help=_("Use a configuration file to define image-build options " +
-               "instead of command line options (they will be ignored)."))
+                      help=_("Use a configuration file to define image-build options " +
+                             "instead of command line options (they will be ignored)."))
     parser.add_option("--disk-size", default=10,
-        help=_("Set the disk device size in gigabytes"))
+                      help=_("Set the disk device size in gigabytes"))
     parser.add_option("--distro",
-        help=_("specify the RPM based distribution the image will be based " +
-             "on with the format RHEL-X.Y, CentOS-X.Y, SL-X.Y, or Fedora-NN. " +
-             "The packages for the Distro you choose must have been built " +
-             "in this system."))
+                      help=_("specify the RPM based distribution the image will be based " +
+                             "on with the format RHEL-X.Y, CentOS-X.Y, SL-X.Y, or Fedora-NN. " +
+                             "The packages for the Distro you choose must have been built " +
+                             "in this system."))
     parser.add_option("--format", default=[], action="append",
-        help=_("Convert results to one or more formats " +
-               "(%s), this option may be used " % ', '.join(formats) +
-               "multiple times. By default, specifying this option will " +
-               "omit the raw disk image (which is 10G in size) from the " +
-               "build results. If you really want it included with converted " +
-               "images, pass in 'raw' as an option."))
+                      help=_("Convert results to one or more formats " +
+                             "(%s), this option may be used " % ', '.join(formats) +
+                             "multiple times. By default, specifying this option will " +
+                             "omit the raw disk image (which is 10G in size) from the " +
+                             "build results. If you really want it included with converted " +
+                             "images, pass in 'raw' as an option."))
     parser.add_option("--kickstart", help=_("Path to a local kickstart file"))
     parser.add_option("--ksurl", metavar="SCMURL",
-        help=_("The URL to the SCM containing the kickstart file"))
+                      help=_("The URL to the SCM containing the kickstart file"))
     parser.add_option("--ksversion", metavar="VERSION",
-        help=_("The syntax version used in the kickstart file"))
+                      help=_("The syntax version used in the kickstart file"))
     parser.add_option("--noprogress", action="store_true",
-        help=_("Do not display progress of the upload"))
+                      help=_("Do not display progress of the upload"))
     parser.add_option("--nowait", action="store_false", dest="wait",
-        help=_("Don't wait on image creation"))
+                      help=_("Don't wait on image creation"))
     parser.add_option("--ova-option", action="append",
-        help=_("Override a value in the OVA description XML. Provide a value " +
-               "in a name=value format, such as 'ovf_memory_mb=6144'"))
+                      help=_("Override a value in the OVA description XML. Provide a value " +
+                             "in a name=value format, such as 'ovf_memory_mb=6144'"))
     parser.add_option("--factory-parameter", nargs=2, action="append",
-        help=_("Pass a parameter to Image Factory. The results are highly specific " +
-               "to the image format being created. This is a two argument parameter " +
-               "that can be specified an arbitrary number of times. For example: "
-               "--factory-parameter docker_cmd '[ \"/bin/echo Hello World\" ]'"))
+                      help=_("Pass a parameter to Image Factory. The results are highly specific " +
+                             "to the image format being created. This is a two argument parameter " +
+                             "that can be specified an arbitrary number of times. For example: "
+                             "--factory-parameter docker_cmd '[ \"/bin/echo Hello World\" ]'"))
     parser.add_option("--release", help=_("Forcibly set the release field"))
     parser.add_option("--repo", action="append",
-        help=_("Specify a repo that will override the repo used to install " +
-               "RPMs in the image. May be used multiple times. The " +
-               "build tag repo associated with the target is the default."))
+                      help=_("Specify a repo that will override the repo used to install " +
+                             "RPMs in the image. May be used multiple times. The " +
+                             "build tag repo associated with the target is the default."))
     parser.add_option("--scratch", action="store_true",
-        help=_("Create a scratch image"))
+                      help=_("Create a scratch image"))
     parser.add_option("--skip-tag", action="store_true",
                       help=_("Do not attempt to tag package"))
     parser.add_option("--can-fail", action="store", dest="optional_arches",
-        metavar="ARCH1,ARCH2,...", default="",
-        help=_("List of archs which are not blocking for build (separated by commas."))
+                      metavar="ARCH1,ARCH2,...", default="",
+                      help=_("List of archs which are not blocking for build (separated by commas."))
     parser.add_option("--specfile", metavar="URL",
-        help=_("SCM URL to spec file fragment to use to generate wrapper RPMs"))
+                      help=_("SCM URL to spec file fragment to use to generate wrapper RPMs"))
     parser.add_option("--wait", action="store_true",
-        help=_("Wait on the image creation, even if running in the background"))
+                      help=_("Wait on the image creation, even if running in the background"))
 
     (task_options, args) = parser.parse_args(args)
 
@@ -5878,7 +5878,7 @@ def _build_image(options, task_opts, session, args, img_type):
     dest_tag = session.getTag(tmp_target['dest_tag'])
     if not dest_tag:
         raise koji.GenericError(_("Unknown destination tag: %s" %
-                                   tmp_target['dest_tag_name']))
+                                  tmp_target['dest_tag_name']))
 
     # Set the architecture
     if img_type == 'livemedia':
@@ -5903,7 +5903,7 @@ def _build_image(options, task_opts, session, args, img_type):
         'ksversion', 'release', 'repo', 'scratch', 'skip_tag',
         'specfile', 'vcpu', 'vmem', 'volid', 'optional_arches',
         'lorax_dir', 'lorax_url',
-        ]
+    ]
     for opt in passthru_opts:
         val = getattr(task_opts, opt, None)
         if val is not None:
@@ -5922,7 +5922,7 @@ def _build_image(options, task_opts, session, args, img_type):
     if task_opts.wait or (task_opts.wait is None and not _running_in_bg()):
         session.logout()
         return watch_tasks(session, [task_id], quiet=options.quiet,
-                poll_interval=options.poll_interval)
+                           poll_interval=options.poll_interval)
     else:
         return
 
@@ -5954,7 +5954,7 @@ def _build_image_oz(options, task_opts, session, args):
     dest_tag = session.getTag(tmp_target['dest_tag'])
     if not dest_tag:
         raise koji.GenericError(_("Unknown destination tag: %s" %
-                                   tmp_target['dest_tag_name']))
+                                  tmp_target['dest_tag_name']))
 
     # Set the architectures
     arches = []
@@ -5971,7 +5971,7 @@ def _build_image_oz(options, task_opts, session, args):
         serverdir = unique_path('cli-image')
         session.uploadWrapper(ksfile, serverdir, callback=callback)
         task_opts.kickstart = os.path.join('work', serverdir,
-            os.path.basename(ksfile))
+                                           os.path.basename(ksfile))
         print('')
 
     hub_opts = {}
@@ -5985,7 +5985,7 @@ def _build_image_oz(options, task_opts, session, args):
 
     # finally, create the task.
     task_id = session.buildImageOz(args[0], args[1], arches, target, args[3],
-                                 opts=hub_opts, priority=priority)
+                                   opts=hub_opts, priority=priority)
 
     if not options.quiet:
         print("Created task: %d" % task_id)
@@ -5993,7 +5993,7 @@ def _build_image_oz(options, task_opts, session, args):
     if task_opts.wait or (task_opts.wait is None and not _running_in_bg()):
         session.logout()
         return watch_tasks(session, [task_id], quiet=options.quiet,
-                poll_interval=options.poll_interval)
+                           poll_interval=options.poll_interval)
     else:
         return
 
@@ -6069,7 +6069,7 @@ def handle_win_build(options, session, args):
     if build_opts.wait or (build_opts.wait is None and not _running_in_bg()):
         session.logout()
         return watch_tasks(session, [task_id], quiet=build_opts.quiet,
-                poll_interval=options.poll_interval)
+                           poll_interval=options.poll_interval)
     else:
         return
 
@@ -6166,7 +6166,7 @@ def handle_list_tasks(goptions, session, args):
     parser.add_option("--channel", help=_("Only tasks in this channel"))
     parser.add_option("--host", help=_("Only tasks for this host"))
     parser.add_option("--quiet", action="store_true", default=goptions.quiet,
-                help=_("Do not display the column headers"))
+                      help=_("Do not display the column headers"))
     (options, args) = parser.parse_args(args)
     if len(args) != 0:
         parser.error(_("This command takes no arguments"))
@@ -6262,15 +6262,15 @@ def handle_set_pkg_owner_global(goptions, session, args):
         if user['id'] == entry['owner_id']:
             if options.verbose:
                 print("Preserving owner=%s for package %s in tag %s" \
-                        % (user['name'], package,  entry['tag_name']))
+                      % (user['name'], package,  entry['tag_name']))
         else:
             if options.test:
                 print("Would have changed owner for %s in tag %s: %s -> %s" \
-                        % (entry['package_name'], entry['tag_name'], entry['owner_name'], user['name']))
+                      % (entry['package_name'], entry['tag_name'], entry['owner_name'], user['name']))
                 continue
             if options.verbose:
                 print("Changing owner for %s in tag %s: %s -> %s" \
-                        % (entry['package_name'], entry['tag_name'], entry['owner_name'], user['name']))
+                      % (entry['package_name'], entry['tag_name'], entry['owner_name'], user['name']))
             session.packageListSetOwner(entry['tag_id'], entry['package_name'], user['id'])
 
 
@@ -6313,7 +6313,7 @@ def anon_handle_watch_task(goptions, session, args):
             parser.error(_("at least one task id must be specified"))
 
     return watch_tasks(session, tasks, quiet=options.quiet,
-            poll_interval=goptions.poll_interval)
+                       poll_interval=goptions.poll_interval)
 
 
 def anon_handle_watch_logs(goptions, session, args):
@@ -6322,7 +6322,7 @@ def anon_handle_watch_logs(goptions, session, args):
     parser = OptionParser(usage=get_usage_str(usage))
     parser.add_option("--log", help=_("Watch only a specific log"))
     parser.add_option("--mine", action="store_true", help=_("Watch logs for "
-        "all your tasks, task_id arguments are forbidden in this case."))
+                                                            "all your tasks, task_id arguments are forbidden in this case."))
     parser.add_option("--follow", action="store_true", help=_("Follow spawned child tasks"))
     (options, args) = parser.parse_args(args)
     activate_session(session, goptions)
@@ -6375,7 +6375,7 @@ def handle_make_task(goptions, session, args):
     else:
         session.logout()
         return watch_tasks(session, [task_id], quiet=goptions.quiet,
-                poll_interval=goptions.poll_interval)
+                           poll_interval=goptions.poll_interval)
 
 
 def handle_tag_build(opts, session, args):
@@ -6399,7 +6399,7 @@ def handle_tag_build(opts, session, args):
     else:
         session.logout()
         return watch_tasks(session, tasks, quiet=opts.quiet,
-                poll_interval=opts.poll_interval)
+                           poll_interval=opts.poll_interval)
 
 
 def handle_move_build(opts, session, args):
@@ -6445,7 +6445,7 @@ def handle_move_build(opts, session, args):
     else:
         session.logout()
         return watch_tasks(session, tasks, quiet=opts.quiet,
-                poll_interval=opts.poll_interval)
+                           poll_interval=opts.poll_interval)
 
 
 def handle_untag_build(goptions, session, args):
@@ -6997,7 +6997,7 @@ def handle_regen_repo(options, session, args):
     else:
         session.logout()
         return watch_tasks(session, [task_id], quiet=options.quiet,
-                poll_interval=options.poll_interval)
+                           poll_interval=options.poll_interval)
 
 
 def handle_dist_repo(options, session, args):
@@ -7011,59 +7011,59 @@ def handle_dist_repo(options, session, args):
     usage += _("\n(Specify the --help option for a list of other options)")
     parser = OptionParser(usage=usage)
     parser.add_option('--allow-missing-signatures', action='store_true',
-        default=False,
-        help=_('For RPMs not signed with a desired key, fall back to the '
-            'primary copy'))
+                      default=False,
+                      help=_('For RPMs not signed with a desired key, fall back to the '
+                             'primary copy'))
     parser.add_option("-a", "--arch", action='append', default=[],
-        help=_("Indicate an architecture to consider. The default is all " +
-            "architectures associated with the given tag. This option may " +
-            "be specified multiple times."))
+                      help=_("Indicate an architecture to consider. The default is all " +
+                             "architectures associated with the given tag. This option may " +
+                             "be specified multiple times."))
     parser.add_option("--with-src", action='store_true', help='Also generate a src repo')
     parser.add_option("--split-debuginfo", action='store_true', default=False,
-            help='Split debuginfo info a separate repo for each arch')
+                      help='Split debuginfo info a separate repo for each arch')
     parser.add_option('--comps', help='Include a comps file in the repodata')
     parser.add_option('--delta-rpms', metavar='REPO',default=[],
-        action='append',
-        help=_('Create delta rpms. REPO can be the id of another dist repo '
-            'or the name of a tag that has a dist repo. May be specified '
-            'multiple times.'))
+                      action='append',
+                      help=_('Create delta rpms. REPO can be the id of another dist repo '
+                             'or the name of a tag that has a dist repo. May be specified '
+                             'multiple times.'))
     parser.add_option('--event', type='int',
-        help=_('Use tag content at event'))
+                      help=_('Use tag content at event'))
     parser.add_option("--volume", help=_("Generate repo on given volume"))
     parser.add_option('--non-latest', dest='latest', default=True,
-        action='store_false', help='Include older builds, not just the latest')
+                      action='store_false', help='Include older builds, not just the latest')
     parser.add_option('--multilib', default=None, metavar="CONFIG",
-        help=_('Include multilib packages in the repository using the given '
-            'config file'))
+                      help=_('Include multilib packages in the repository using the given '
+                             'config file'))
     parser.add_option("--noinherit", action='store_true', default=False,
-        help=_('Do not consider tag inheritance'))
+                      help=_('Do not consider tag inheritance'))
     parser.add_option("--nowait", action='store_true', default=False,
-        help=_('Do not wait for the task to complete'))
+                      help=_('Do not wait for the task to complete'))
     parser.add_option('--skip-missing-signatures', action='store_true', default=False,
-        help=_('Skip RPMs not signed with the desired key(s)'))
+                      help=_('Skip RPMs not signed with the desired key(s)'))
     parser.add_option('--zck', action='store_true', default=False,
-        help=_('Generate zchunk files as well as the standard repodata'))
+                      help=_('Generate zchunk files as well as the standard repodata'))
     parser.add_option('--zck-dict-dir', action='store', default=None,
-        help=_('Directory containing compression dictionaries for use by zchunk (on builder)'))
+                      help=_('Directory containing compression dictionaries for use by zchunk (on builder)'))
     task_opts, args = parser.parse_args(args)
     if len(args) < 1:
         parser.error(_('You must provide a tag to generate the repo from'))
     if len(args) < 2 and not task_opts.allow_missing_signatures:
         parser.error(_('Please specify one or more GPG key IDs (or '
-                '--allow-missing-signatures)'))
+                       '--allow-missing-signatures)'))
     if task_opts.allow_missing_signatures and task_opts.skip_missing_signatures:
         parser.error(_('allow_missing_signatures and skip_missing_signatures '
-                'are mutually exclusive'))
+                       'are mutually exclusive'))
     activate_session(session, options)
     stuffdir = unique_path('cli-dist-repo')
     if task_opts.comps:
         if not os.path.exists(task_opts.comps):
             parser.error(_('could not find %s') % task_opts.comps)
         session.uploadWrapper(task_opts.comps, stuffdir,
-            callback=_progress_callback)
+                              callback=_progress_callback)
         print('')
         task_opts.comps = os.path.join(stuffdir,
-            os.path.basename(task_opts.comps))
+                                       os.path.basename(task_opts.comps))
     old_repos = []
     if len(task_opts.delta_rpms) > 0:
         for repo in task_opts.delta_rpms:
@@ -7075,7 +7075,7 @@ def handle_dist_repo(options, session, args):
                 if not rinfo:
                     # maybe there is an expired one
                     rinfo = session.getRepo(repo,
-                            state=koji.REPO_STATES['EXPIRED'], dist=True)
+                                            state=koji.REPO_STATES['EXPIRED'], dist=True)
                 if not rinfo:
                     parser.error(_("Can't find repo for tag: %s") % repo)
             old_repos.append(rinfo['id'])
@@ -7103,9 +7103,9 @@ def handle_dist_repo(options, session, args):
         if 'ppc64' in task_opts.arch and not 'ppc' in task_opts.arch:
             parser.error(_('The multilib arch (ppc) must be included'))
         session.uploadWrapper(task_opts.multilib, stuffdir,
-            callback=_progress_callback)
+                              callback=_progress_callback)
         task_opts.multilib = os.path.join(stuffdir,
-            os.path.basename(task_opts.multilib))
+                                          os.path.basename(task_opts.multilib))
         print('')
     if 'noarch' in task_opts.arch:
         task_opts.arch.remove('noarch')
@@ -7135,7 +7135,7 @@ def handle_dist_repo(options, session, args):
     else:
         session.logout()
         return watch_tasks(session, [task_id], quiet=options.quiet,
-                poll_interval=options.poll_interval)
+                           poll_interval=options.poll_interval)
 
 
 _search_types = ('package', 'build', 'tag', 'target', 'user', 'host', 'rpm',
@@ -7333,13 +7333,13 @@ def handle_edit_notification(goptions, session, args):
     usage = _("usage: %prog edit-notification [options] <notification_id>")
     parser = OptionParser(usage=get_usage_str(usage))
     parser.add_option("--package",
-            help=_("Notifications for this package, '*' for all"))
+                      help=_("Notifications for this package, '*' for all"))
     parser.add_option("--tag",
-            help=_("Notifications for this tag, '*' for all"))
+                      help=_("Notifications for this tag, '*' for all"))
     parser.add_option("--success-only", action="store_true", default=None,
-            dest='success_only', help=_("Notify only on successful events"))
+                      dest='success_only', help=_("Notify only on successful events"))
     parser.add_option("--no-success-only", action="store_false",
-            default=None, dest='success_only', help=_("Notify on all events"))
+                      default=None, dest='success_only', help=_("Notify on all events"))
     (options, args) = parser.parse_args(args)
 
     if len(args) != 1:
diff --git a/cli/koji_cli/lib.py b/cli/koji_cli/lib.py
index 4d3213ca..4da5ff89 100644
--- a/cli/koji_cli/lib.py
+++ b/cli/koji_cli/lib.py
@@ -34,22 +34,22 @@ greetings = ('hello', 'hi', 'yo', "what's up", "g'day", 'back to work',
              'hallo',
              'ciao',
              'hola',
-            u'olá',
-            u'dobrý den',
-            u'zdravstvuite',
-            u'góðan daginn',
+             u'olá',
+             u'dobrý den',
+             u'zdravstvuite',
+             u'góðan daginn',
              'hej',
              'tervehdys',
-            u'grüezi',
-            u'céad míle fáilte',
-            u'hylô',
-            u'bună ziua',
-            u'jó napot',
+             u'grüezi',
+             u'céad míle fáilte',
+             u'hylô',
+             u'bună ziua',
+             u'jó napot',
              'dobre dan',
-            u'你好',
-            u'こんにちは',
-            u'नमस्कार',
-            u'안녕하세요')
+             u'你好',
+             u'こんにちは',
+             u'नमस्कार',
+             u'안녕하세요')
 
 ARGMAP = {'None': None,
           'True': True,
@@ -276,7 +276,7 @@ def watch_tasks(session, tasklist, quiet=False, poll_interval=60, ki_handler=Non
                 tlist = ['%s: %s' % (t.str(), t.display_state(t.info))
                          for t in tasks.values() if not t.is_done()]
                 print(
-"""Tasks still running. You can continue to watch with the '%s watch-task' command.
+                    """Tasks still running. You can continue to watch with the '%s watch-task' command.
 Running Tasks:
 %s""" % (progname, '\n'.join(tlist)))
     sys.stdout.flush()
@@ -414,7 +414,7 @@ def unique_path(prefix):
     # For some reason repr(time.time()) includes 4 or 5
     # more digits of precision than str(time.time())
     return '%s/%r.%s' % (prefix, time.time(),
-                      ''.join([random.choice(string.ascii_letters) for i in range(8)]))
+                         ''.join([random.choice(string.ascii_letters) for i in range(8)]))
 
 
 def _format_size(size):
diff --git a/hub/kojihub.py b/hub/kojihub.py
index 6699359f..c43b8533 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -96,25 +96,25 @@ class Task(object):
     """A task for the build hosts"""
 
     fields = (
-                ('task.id', 'id'),
-                ('task.state', 'state'),
-                ('task.create_time', 'create_time'),
-                ('EXTRACT(EPOCH FROM create_time)', 'create_ts'),
-                ('task.start_time', 'start_time'),
-                ('EXTRACT(EPOCH FROM task.start_time)', 'start_ts'),
-                ('task.completion_time', 'completion_time'),
-                ('EXTRACT(EPOCH FROM completion_time)', 'completion_ts'),
-                ('task.channel_id', 'channel_id'),
-                ('task.host_id', 'host_id'),
-                ('task.parent', 'parent'),
-                ('task.label', 'label'),
-                ('task.waiting', 'waiting'),
-                ('task.awaited', 'awaited'),
-                ('task.owner', 'owner'),
-                ('task.method', 'method'),
-                ('task.arch', 'arch'),
-                ('task.priority', 'priority'),
-                ('task.weight', 'weight'))
+        ('task.id', 'id'),
+        ('task.state', 'state'),
+        ('task.create_time', 'create_time'),
+        ('EXTRACT(EPOCH FROM create_time)', 'create_ts'),
+        ('task.start_time', 'start_time'),
+        ('EXTRACT(EPOCH FROM task.start_time)', 'start_ts'),
+        ('task.completion_time', 'completion_time'),
+        ('EXTRACT(EPOCH FROM completion_time)', 'completion_ts'),
+        ('task.channel_id', 'channel_id'),
+        ('task.host_id', 'host_id'),
+        ('task.parent', 'parent'),
+        ('task.label', 'label'),
+        ('task.waiting', 'waiting'),
+        ('task.awaited', 'awaited'),
+        ('task.owner', 'owner'),
+        ('task.method', 'method'),
+        ('task.arch', 'arch'),
+        ('task.priority', 'priority'),
+        ('task.weight', 'weight'))
 
     def __init__(self, id):
         self.id = id
@@ -192,12 +192,12 @@ class Task(object):
             if state == koji.TASK_STATES['FREE']:
                 if otherhost is not None:
                     log_error("Error: task %i is both free and locked (host %i)"
-                        % (task_id, otherhost))
+                              % (task_id, otherhost))
                     return False
             elif state == koji.TASK_STATES['ASSIGNED']:
                 if otherhost is None:
                     log_error("Error: task %i is assigned, but has no assignee"
-                        % (task_id))
+                              % (task_id))
                     return False
                 elif otherhost != host_id:
                     # task is assigned to someone else
@@ -206,7 +206,7 @@ class Task(object):
             else:
                 if otherhost is None:
                     log_error("Error: task %i is non-free but unlocked (state %i)"
-                        % (task_id, state))
+                              % (task_id, state))
                 return False
         # if we reach here, task is either
         #  - free and unlocked
@@ -236,7 +236,7 @@ class Task(object):
             # get more complete data to return
             fields = self.fields + (('task.request', 'request'),)
             query = QueryProcessor(tables=['task'], clauses=['id=%(id)i'], values=vars(self),
-                            columns=[f[0] for f in fields], aliases=[f[1] for f in fields])
+                                   columns=[f[0] for f in fields], aliases=[f[1] for f in fields])
             ret = query.executeOne()
             if ret['request'].find('<?xml', 0, 10) == -1:
                 # handle older base64 encoded data
@@ -261,7 +261,7 @@ class Task(object):
         oldstate = row[0]
         if koji.TASK_STATES[oldstate] in ['CLOSED', 'CANCELED', 'FAILED']:
             raise koji.GenericError("Cannot free task %i, state is %s" % \
-                    (self.id, koji.TASK_STATES[oldstate]))
+                                    (self.id, koji.TASK_STATES[oldstate]))
         newstate = koji.TASK_STATES['FREE']
         newhost = None
         q = """UPDATE task SET state=%(newstate)s,host_id=%(newhost)s
@@ -613,13 +613,13 @@ def make_task(method, arglist, **opts):
             elif parts[0] == "parent":
                 if not opts.get('parent'):
                     logger.error("Invalid channel policy result (no parent task): %s",
-                                    ruleset.last_rule())
+                                 ruleset.last_rule())
                     raise koji.GenericError("invalid channel policy")
                 opts['channel_id'] = pdata['channel_id']
             elif parts[0] == "req":
                 if 'channel' not in opts:
                     logger.error('Invalid channel policy result (no channel requested): %s',
-                                    ruleset.last_rule())
+                                 ruleset.last_rule())
                     raise koji.GenericError("invalid channel policy")
                 opts['channel_id'] = req_channel_id
             else:
@@ -664,7 +664,7 @@ def eventCondition(event, table=None):
 def readGlobalInheritance(event=None):
     c = context.cnx.cursor()
     fields = ('tag_id', 'parent_id', 'name', 'priority', 'maxdepth', 'intransitive',
-                'noconfig', 'pkg_filter')
+              'noconfig', 'pkg_filter')
     q = """SELECT %s FROM tag_inheritance JOIN tag ON parent_id = id
     WHERE %s
     ORDER BY priority
@@ -777,7 +777,7 @@ def _writeInheritanceData(tag_id, changes, clear=False):
             continue
         # revoke old values
         update = UpdateProcessor('tag_inheritance', values=locals(),
-                    clauses=['tag_id=%(tag_id)s', 'parent_id = %(parent_id)s'])
+                                 clauses=['tag_id=%(tag_id)s', 'parent_id = %(parent_id)s'])
         update.make_revoke()
         update.execute()
     for parent_id, link in six.iteritems(data):
@@ -943,11 +943,11 @@ def _pkglist_add(tag_id, pkg_id, owner, block, extra_arches):
 def pkglist_add(taginfo, pkginfo, owner=None, block=None, extra_arches=None, force=False, update=False):
     """Add to (or update) package list for tag"""
     return _direct_pkglist_add(taginfo, pkginfo, owner, block, extra_arches,
-            force, update, policy=True)
+                               force, update, policy=True)
 
 
 def _direct_pkglist_add(taginfo, pkginfo, owner, block, extra_arches, force,
-        update, policy=False):
+                        update, policy=False):
     """Like pkglist_add, but without policy or access check"""
     # access control comes a little later (via an assert_policy)
     # should not make any changes until after policy is checked
@@ -991,7 +991,7 @@ def _direct_pkglist_add(taginfo, pkginfo, owner, block, extra_arches, force,
         if update and not force:
             # if update flag is true, require that there be a previous entry
             raise koji.GenericError("cannot update: tag %s has no data for package %s" \
-                    % (tag['name'], pkg['name']))
+                                    % (tag['name'], pkg['name']))
     else:
         # already there (possibly via inheritance)
         if owner is None:
@@ -1086,7 +1086,7 @@ def pkglist_unblock(taginfo, pkginfo, force=False):
     previous = pkglist.get(pkg_id, None)
     if previous is None:
         raise koji.GenericError("no data (blocked or otherwise) for package %s in tag %s" \
-                % (pkg['name'], tag['name']))
+                                % (pkg['name'], tag['name']))
     if not previous['blocked']:
         raise koji.GenericError("package %s NOT blocked in tag %s" % (pkg['name'], tag['name']))
     if previous['tag_id'] != tag_id:
@@ -1325,7 +1325,7 @@ def readTaggedBuilds(tag, event=None, inherit=False, latest=False, package=None,
             raise koji.GenericError('unsupported build type: %s' % type)
         btype_id = btype['id']
         type_join = ('JOIN build_types ON build.id = build_types.build_id '
-                'AND btype_id = %(btype_id)s')
+                     'AND btype_id = %(btype_id)s')
 
     q = """SELECT %s
     FROM tag_listing
@@ -1407,7 +1407,7 @@ def readTaggedRPMS(tag, package=None, arch=None, event=None, inherit=False, late
               ('rpminfo.build_id', 'build_id'),
               ('rpminfo.metadata_only', 'metadata_only'),
               ('rpminfo.extra', 'extra'),
-            ]
+              ]
     tables = ['rpminfo']
     joins = ['tag_listing ON rpminfo.build_id = tag_listing.build_id']
     clauses = [eventCondition(event, 'tag_listing'), 'tag_id=%(tagid)s']
@@ -1499,7 +1499,7 @@ def readTaggedArchives(tag, package=None, event=None, inherit=False, latest=True
               ('archiveinfo.checksum_type', 'checksum_type'),
               ('archiveinfo.metadata_only', 'metadata_only'),
               ('archiveinfo.extra', 'extra'),
-             ]
+              ]
     tables = ['archiveinfo']
     joins = ['tag_listing ON archiveinfo.build_id = tag_listing.build_id',
              'btype ON archiveinfo.btype_id = btype.id']
@@ -1676,7 +1676,7 @@ def _direct_untag_build(tag, build, user, strict=True, force=False):
     koji.plugin.run_callbacks('preUntag', tag=tag, build=build, user=user, force=force, strict=strict)
     values = {'tag_id': tag['id'], 'build_id': build['id']}
     update = UpdateProcessor('tag_listing', values=values,
-                clauses=['tag_id=%(tag_id)i', 'build_id=%(build_id)i'])
+                             clauses=['tag_id=%(tag_id)i', 'build_id=%(build_id)i'])
     update.make_revoke(user_id=user['id'])
     count = update.execute()
     if count == 0 and strict:
@@ -1738,7 +1738,7 @@ def _grplist_add(taginfo, grpinfo, block, force, **opts):
     opts['group_id'] = group['id']
     # revoke old entry (if present)
     update = UpdateProcessor('group_config', values=opts,
-                clauses=['group_id=%(group_id)s', 'tag_id=%(tag_id)s'])
+                             clauses=['group_id=%(group_id)s', 'tag_id=%(tag_id)s'])
     update.make_revoke()
     update.execute()
     # add new entry
@@ -1859,7 +1859,7 @@ def _grp_pkg_add(taginfo, grpinfo, pkg_name, block, force, **opts):
         # already there (possibly via inheritance)
         if previous['blocked'] and not force:
             raise koji.GenericError("package %s blocked in group %s, tag %s" \
-                    % (pkg_name, group['name'], tag['name']))
+                                    % (pkg_name, group['name'], tag['name']))
         # check for duplication and grab old data for defaults
         changed = False
         for field in cfg_fields:
@@ -1883,7 +1883,7 @@ def _grp_pkg_add(taginfo, grpinfo, pkg_name, block, force, **opts):
     opts['blocked'] = block
     # revoke old entry (if present)
     update = UpdateProcessor('group_package_listing', values=opts,
-                clauses=['group_id=%(group_id)s', 'tag_id=%(tag_id)s', 'package=%(package)s'])
+                             clauses=['group_id=%(group_id)s', 'tag_id=%(tag_id)s', 'package=%(package)s'])
     update.make_revoke()
     update.execute()
     # add new entry
@@ -1908,7 +1908,7 @@ def _grp_pkg_remove(taginfo, grpinfo, pkg_name, force):
     tag_id = get_tag_id(taginfo, strict=True)
     grp_id = get_group_id(grpinfo, strict=True)
     update = UpdateProcessor('group_package_listing', values=locals(),
-                clauses=['package=%(pkg_name)s', 'tag_id=%(tag_id)s', 'group_id = %(grp_id)s'])
+                             clauses=['package=%(pkg_name)s', 'tag_id=%(tag_id)s', 'group_id = %(grp_id)s'])
     update.make_revoke()
     update.execute()
 
@@ -1941,7 +1941,7 @@ def _grp_pkg_unblock(taginfo, grpinfo, pkg_name):
     blocked = query.singleValue(strict=False)
     if not blocked:
         raise koji.GenericError("package %s is NOT blocked in group %s, tag %s" \
-                    % (pkg_name, grp_id, tag_id))
+                                % (pkg_name, grp_id, tag_id))
     update = UpdateProcessor('group_package_listing', values=locals(), clauses=clauses)
     update.make_revoke()
     update.execute()
@@ -1983,7 +1983,7 @@ def _grp_req_add(taginfo, grpinfo, reqinfo, block, force, **opts):
         # already there (possibly via inheritance)
         if previous['blocked'] and not force:
             raise koji.GenericError("requirement on group %s blocked in group %s, tag %s" \
-                    % (req['name'], group['name'], tag['name']))
+                                    % (req['name'], group['name'], tag['name']))
         # check for duplication and grab old data for defaults
         changed = False
         for field in cfg_fields:
@@ -2007,7 +2007,7 @@ def _grp_req_add(taginfo, grpinfo, reqinfo, block, force, **opts):
     opts['blocked'] = block
     # revoke old entry (if present)
     update = UpdateProcessor('group_req_listing', values=opts,
-                clauses=['group_id=%(group_id)s', 'tag_id=%(tag_id)s', 'req_id=%(req_id)s'])
+                             clauses=['group_id=%(group_id)s', 'tag_id=%(tag_id)s', 'req_id=%(req_id)s'])
     update.make_revoke()
     update.execute()
     # add new entry
@@ -2033,7 +2033,7 @@ def _grp_req_remove(taginfo, grpinfo, reqinfo, force):
     grp_id = get_group_id(grpinfo, strict=True)
     req_id = get_group_id(reqinfo, strict=True)
     update = UpdateProcessor('group_req_listing', values=locals(),
-                clauses=['req_id=%(req_id)s', 'tag_id=%(tag_id)s', 'group_id = %(grp_id)s'])
+                             clauses=['req_id=%(req_id)s', 'tag_id=%(tag_id)s', 'group_id = %(grp_id)s'])
     update.make_revoke()
     update.execute()
 
@@ -2068,7 +2068,7 @@ def _grp_req_unblock(taginfo, grpinfo, reqinfo):
     blocked = query.singleValue(strict=False)
     if not blocked:
         raise koji.GenericError("group req %s is NOT blocked in group %s, tag %s" \
-                    % (req_id, grp_id, tag_id))
+                                % (req_id, grp_id, tag_id))
     update = UpdateProcessor('group_req_listing', values=locals(), clauses=clauses)
     update.make_revoke()
     update.execute()
@@ -2274,12 +2274,12 @@ def remove_channel(channel_name, force=False):
     channel_id = get_channel_id(channel_name, strict=True)
     # check for task references
     query = QueryProcessor(tables=['task'], clauses=['channel_id=%(channel_id)i'],
-                    values=locals(), columns=['id'], opts={'limit':1})
+                           values=locals(), columns=['id'], opts={'limit':1})
     # XXX slow query
     if query.execute():
         raise koji.GenericError('channel %s has task references' % channel_name)
     query = QueryProcessor(tables=['host_channels'], clauses=['channel_id=%(channel_id)i'],
-                    values=locals(), columns=['host_id'], opts={'limit':1})
+                           values=locals(), columns=['host_id'], opts={'limit':1})
     if query.execute():
         if not force:
             raise koji.GenericError('channel %s has host references' % channel_name)
@@ -2494,7 +2494,7 @@ def repo_init(tag, with_src=False, with_debuginfo=False, event=None, with_separa
     rpms, builds = readTaggedRPMS(tag_id, event=event_id, inherit=True, latest=latest)
     groups = readTagGroups(tag_id, event=event_id, inherit=True)
     blocks = [pkg for pkg in readPackageList(tag_id, event=event_id, inherit=True).values() \
-                  if pkg['blocked']]
+              if pkg['blocked']]
     repodir = koji.pathinfo.repo(repo_id, tinfo['name'])
     os.makedirs(repodir)  #should not already exist
 
@@ -2507,14 +2507,14 @@ def repo_init(tag, with_src=False, with_debuginfo=False, event=None, with_separa
 
     # write repo info to disk
     repo_info = {
-            'id': repo_id,
-            'tag': tinfo['name'],
-            'tag_id': tinfo['id'],
-            'event_id': event_id,
-            'with_src': with_src,
-            'with_separate_src': with_separate_src,
-            'with_debuginfo': with_debuginfo,
-            }
+        'id': repo_id,
+        'tag': tinfo['name'],
+        'tag_id': tinfo['id'],
+        'event_id': event_id,
+        'with_src': with_src,
+        'with_separate_src': with_separate_src,
+        'with_debuginfo': with_debuginfo,
+    }
     with open('%s/repo.json' % repodir, 'w') as fp:
         json.dump(repo_info, fp, indent=2)
 
@@ -2577,7 +2577,7 @@ def repo_init(tag, with_src=False, with_debuginfo=False, event=None, with_separa
                          'release': archive['build_release'],
                          'epoch': archive['build_epoch'],
                          'volume_name': archive['volume_name'],
-                        }
+                         }
             srcdir = joinpath(koji.pathinfo.mavenbuild(buildinfo),
                               koji.pathinfo.mavenrepo(archive))
             destlink = joinpath(repodir, 'maven',
@@ -2649,15 +2649,15 @@ def dist_repo_init(tag, keys, task_opts):
     arches = list(set([koji.canonArch(a) for a in task_opts['arch']]))
     # note: we need to match args from the other preRepoInit callback
     koji.plugin.run_callbacks('preRepoInit', tag=tinfo, with_src=False,
-            with_debuginfo=False, event=event, repo_id=None,
-            dist=True, keys=keys, arches=arches, task_opts=task_opts,
-            with_separate_src=False)
+                              with_debuginfo=False, event=event, repo_id=None,
+                              dist=True, keys=keys, arches=arches, task_opts=task_opts,
+                              with_separate_src=False)
     if not event:
         event = get_event()
     repo_id = nextval('repo_id_seq')
     insert = InsertProcessor('repo')
     insert.set(id=repo_id, create_event=event, tag_id=tag_id,
-        state=state, dist=True)
+               state=state, dist=True)
     insert.execute()
     repodir = koji.pathinfo.distrepo(repo_id, tinfo['name'], volume=volume)
     for arch in arches:
@@ -2673,23 +2673,23 @@ def dist_repo_init(tag, keys, task_opts):
         groupsdir = joinpath(repodir, 'groups')
         koji.ensuredir(groupsdir)
         shutil.copyfile(joinpath(koji.pathinfo.work(),
-            task_opts['comps']), groupsdir + '/comps.xml')
+                                 task_opts['comps']), groupsdir + '/comps.xml')
     # write repo info to disk
     repo_info = {
-            'id': repo_id,
-            'tag': tinfo['name'],
-            'tag_id': tinfo['id'],
-            'keys': keys,
-            'volume': volume,
-            'task_opts': task_opts,
-            }
+        'id': repo_id,
+        'tag': tinfo['name'],
+        'tag_id': tinfo['id'],
+        'keys': keys,
+        'volume': volume,
+        'task_opts': task_opts,
+    }
     with open('%s/repo.json' % repodir, 'w') as fp:
         json.dump(repo_info, fp, indent=2)
     # note: we need to match args from the other postRepoInit callback
     koji.plugin.run_callbacks('postRepoInit', tag=tinfo, with_src=False,
-            with_debuginfo=False, event=event, repo_id=repo_id,
-            dist=True, keys=keys, arches=arches, task_opts=task_opts,
-            repodir=repodir, with_reparate_src=False)
+                              with_debuginfo=False, event=event, repo_id=repo_id,
+                              dist=True, keys=keys, arches=arches, task_opts=task_opts,
+                              repodir=repodir, with_reparate_src=False)
     return repo_id, event
 
 
@@ -2701,7 +2701,7 @@ def repo_set_state(repo_id, state, check=True):
         oldstate = _singleValue(q, locals())
         if oldstate > state:
             raise koji.GenericError("Invalid repo state transition %s->%s" \
-                    % (oldstate, state))
+                                    % (oldstate, state))
     q = """UPDATE repo SET state=%(state)s WHERE id = %(repo_id)s"""
     _dml(q, locals())
 
@@ -2775,7 +2775,7 @@ def repo_references(repo_id):
     values = {'repo_id': repo_id}
     clauses = ['repo_id=%(repo_id)s', 'retire_event IS NULL']
     query = QueryProcessor(columns=fields, aliases=aliases, tables=['standard_buildroot'],
-                clauses=clauses, values=values)
+                           clauses=clauses, values=values)
     # check results for bad states
     ret = []
     for data in query.execute():
@@ -2805,7 +2805,7 @@ def get_active_repos():
     joins = ['tag ON repo.tag_id=tag.id', 'events ON repo.create_event = events.id']
     clauses = ['repo.state != %(st_deleted)s']
     query = QueryProcessor(columns=fields, aliases=aliases, tables=['repo'],
-                joins=joins, clauses=clauses, values=values)
+                           joins=joins, clauses=clauses, values=values)
     return query.execute()
 
 
@@ -2824,8 +2824,8 @@ def tag_changed_since_event(event, taglist):
     # first check the tag_updates table
     clauses = ['update_event > %(event)i', 'tag_id IN %(taglist)s']
     query = QueryProcessor(tables=['tag_updates'], columns=['id'],
-                            clauses=clauses, values=data,
-                            opts={'limit': 1})
+                           clauses=clauses, values=data,
+                           opts={'limit': 1})
     if query.execute():
         return True
     # also check these versioned tables
@@ -2843,7 +2843,7 @@ def tag_changed_since_event(event, taglist):
                'tag_id IN %(taglist)s']
     for table in tables:
         query = QueryProcessor(tables=[table], columns=['tag_id'], clauses=clauses,
-                                values=data, opts={'limit': 1})
+                               values=data, opts={'limit': 1})
         if query.execute():
             return True
     return False
@@ -2948,7 +2948,7 @@ def _edit_build_target(buildTargetInfo, name, build_tag, dest_tag):
         _dml(rename, locals())
 
     update = UpdateProcessor('build_target_config', values=locals(),
-                clauses=["build_target_id = %(buildTargetID)i"])
+                             clauses=["build_target_id = %(buildTargetID)i"])
     update.make_revoke()
 
     insert = InsertProcessor('build_target_config')
@@ -2977,7 +2977,7 @@ def _delete_build_target(buildTargetInfo):
     # build targets are versioned, so we do not delete them from the db
     # instead we revoke the config entry
     update = UpdateProcessor('build_target_config', values=locals(),
-                clauses=["build_target_id = %(targetID)i"])
+                             clauses=["build_target_id = %(targetID)i"])
     update.make_revoke()
     update.execute()
 
@@ -3224,7 +3224,7 @@ def get_tag(tagInfo, strict=False, event=None):
               'tag_config.locked': 'locked',
               'tag_config.maven_support': 'maven_support',
               'tag_config.maven_include_all': 'maven_include_all'
-             }
+              }
     clauses = [eventCondition(event, table='tag_config')]
     if isinstance(tagInfo, six.integer_types):
         clauses.append("tag.id = %(tagInfo)i")
@@ -3290,7 +3290,7 @@ def edit_tag(tagInfo, **kwargs):
 def _edit_tag(tagInfo, **kwargs):
     """Edit information for an existing tag."""
     if not context.opts.get('EnableMaven') \
-                and dslice(kwargs, ['maven_support', 'maven_include_all'], strict=False):
+            and dslice(kwargs, ['maven_support', 'maven_include_all'], strict=False):
         raise koji.GenericError("Maven support not enabled")
 
     tag = get_tag(tagInfo, strict=True)
@@ -3313,7 +3313,7 @@ def _edit_tag(tagInfo, **kwargs):
         values = {
             'name': name,
             'tagID': tag['id']
-            }
+        }
         q = """SELECT id FROM tag WHERE name=%(name)s"""
         id = _singleValue(q, values, strict=False)
         if id is not None:
@@ -3406,7 +3406,7 @@ def _delete_tag(tagInfo):
 
     def _tagDelete(tableName, value, columnName='tag_id'):
         update = UpdateProcessor(tableName, clauses=["%s = %%(value)i" % columnName],
-                    values={'value':value})
+                                 values={'value':value})
         update.make_revoke()
         update.execute()
 
@@ -3519,7 +3519,7 @@ def edit_external_repo(info, name=None, url=None):
             url += '/'
 
         update = UpdateProcessor('external_repo_config', values=locals(),
-                    clauses=['external_repo_id = %(repo_id)i'])
+                                 clauses=['external_repo_id = %(repo_id)i'])
         update.make_revoke()
 
         insert = InsertProcessor('external_repo_config')
@@ -3542,7 +3542,7 @@ def delete_external_repo(info):
                                       repo_info=repo_id)
 
     update = UpdateProcessor('external_repo_config', values=locals(),
-                    clauses=['external_repo_id = %(repo_id)i'])
+                             clauses=['external_repo_id = %(repo_id)i'])
     update.make_revoke()
     update.execute()
 
@@ -3562,10 +3562,10 @@ def add_external_repo_to_tag(tag_info, repo_info, priority, merge_mode='koji'):
     tag_repos = get_tag_external_repos(tag_info=tag_id)
     if [tr for tr in tag_repos if tr['external_repo_id'] == repo_id]:
         raise koji.GenericError('tag %s already associated with external repo %s' % \
-            (tag['name'], repo['name']))
+                                (tag['name'], repo['name']))
     if [tr for tr in tag_repos if tr['priority'] == priority]:
         raise koji.GenericError('tag %s already associated with an external repo at priority %i' % \
-            (tag['name'], priority))
+                                (tag['name'], priority))
 
     insert = InsertProcessor('tag_external_repos')
     insert.set(tag_id=tag_id, external_repo_id=repo_id, priority=priority,
@@ -3585,10 +3585,10 @@ def remove_external_repo_from_tag(tag_info, repo_info):
 
     if not get_tag_external_repos(tag_info=tag_id, repo_info=repo_id):
         raise koji.GenericError('external repo %s not associated with tag %s' % \
-            (repo['name'], tag['name']))
+                                (repo['name'], tag['name']))
 
     update = UpdateProcessor('tag_external_repos', values=locals(),
-                clauses=["tag_id = %(tag_id)i", "external_repo_id = %(repo_id)i"])
+                             clauses=["tag_id = %(tag_id)i", "external_repo_id = %(repo_id)i"])
     update.make_revoke()
     update.execute()
 
@@ -3606,7 +3606,7 @@ def edit_tag_external_repo(tag_info, repo_info, priority):
     tag_repos = get_tag_external_repos(tag_info=tag_id, repo_info=repo_id)
     if not tag_repos:
         raise koji.GenericError('external repo %s not associated with tag %s' % \
-            (repo['name'], tag['name']))
+                                (repo['name'], tag['name']))
     tag_repo = tag_repos[0]
 
     if priority != tag_repo['priority']:
@@ -3631,14 +3631,14 @@ def get_tag_external_repos(tag_info=None, repo_info=None, event=None):
              'external_repo ON tag_external_repos.external_repo_id = external_repo.id',
              'external_repo_config ON external_repo.id = external_repo_config.external_repo_id']
     fields = {
-            'external_repo.id': 'external_repo_id',
-            'external_repo.name': 'external_repo_name',
-            'priority': 'priority',
-            'tag.id': 'tag_id',
-            'tag.name': 'tag_name',
-            'url': 'url',
-            'merge_mode': 'merge_mode',
-            }
+        'external_repo.id': 'external_repo_id',
+        'external_repo.name': 'external_repo_name',
+        'priority': 'priority',
+        'tag.id': 'tag_id',
+        'tag.name': 'tag_name',
+        'url': 'url',
+        'merge_mode': 'merge_mode',
+    }
     columns, aliases = zip(*fields.items())
 
     clauses = [eventCondition(event, table='tag_external_repos'), eventCondition(event, table='external_repo_config')]
@@ -3784,7 +3784,7 @@ def _edit_user(userInfo, name=None, krb_principal_mappings=None):
         values = {
             'name': name,
             'userID': user['id']
-            }
+        }
         q = """SELECT id FROM users WHERE name=%(name)s"""
         id = _singleValue(q, values, strict=False)
         if id is not None:
@@ -3978,7 +3978,7 @@ def get_build(buildInfo, strict=False):
              'package on build.pkg_id = package.id',
              'volume on build.volume_id = volume.id',
              'users on build.owner = users.id',
-            ]
+             ]
     clauses = ['build.id = %(buildID)i']
     query = QueryProcessor(columns=fields, aliases=aliases, values=locals(),
                            transform=_fix_extra_field,
@@ -4021,7 +4021,7 @@ def get_build_logs(build):
                 'name': fn,
                 'dir': subdir,
                 'path': "%s/%s/%s" % (logreldir, subdir, fn)
-                }
+            }
             logs.append(loginfo)
     return logs
 
@@ -4030,14 +4030,14 @@ def get_next_release(build_info):
     """find the last successful or deleted build of this N-V. If building is
     specified, skip also builds in progress"""
     values = {
-                  'name': build_info['name'],
-                  'version': build_info['version'],
-                  'states': (
-                      koji.BUILD_STATES['COMPLETE'],
-                      koji.BUILD_STATES['DELETED'],
-                      koji.BUILD_STATES['BUILDING']
-                  )
-             }
+        'name': build_info['name'],
+        'version': build_info['version'],
+        'states': (
+            koji.BUILD_STATES['COMPLETE'],
+            koji.BUILD_STATES['DELETED'],
+            koji.BUILD_STATES['BUILDING']
+        )
+    }
     query = QueryProcessor(tables=['build'], joins=['package ON build.pkg_id = package.id'],
                            columns=['build.id', 'release'],
                            clauses=['name = %(name)s', 'version = %(version)s',
@@ -4124,7 +4124,7 @@ def get_rpm(rpminfo, strict=False, multi=False):
         ('buildtime', 'buildtime'),
         ('metadata_only', 'metadata_only'),
         ('extra', 'extra'),
-        )
+    )
     # we can look up by id or NVRA
     data = None
     if isinstance(rpminfo, six.integer_types):
@@ -4214,7 +4214,7 @@ def list_rpms(buildID=None, buildrootID=None, imageID=None, componentBuildrootID
               ('external_repo.name', 'external_repo_name'),
               ('rpminfo.metadata_only', 'metadata_only'),
               ('rpminfo.extra', 'extra'),
-             ]
+              ]
     joins = ['LEFT JOIN external_repo ON rpminfo.external_repo_id = external_repo.id']
     clauses = []
 
@@ -4334,13 +4334,13 @@ def get_build_type(buildInfo, strict=False):
         return None
 
     query = QueryProcessor(
-                tables=['btype'],
-                columns=['name'],
-                joins=['build_types ON btype_id=btype.id'],
-                clauses=['build_id = %(id)i'],
-                values=binfo,
-                opts={'asList':True},
-            )
+        tables=['btype'],
+        columns=['name'],
+        joins=['build_types ON btype_id=btype.id'],
+        clauses=['build_id = %(id)i'],
+        values=binfo,
+        opts={'asList':True},
+    )
 
     ret = {}
     extra = binfo['extra'] or {}
@@ -4479,7 +4479,7 @@ def list_archives(buildID=None, buildrootID=None, componentBuildrootID=None, hos
               ('archivetypes.name', 'type_name'),
               ('archivetypes.description', 'type_description'),
               ('archivetypes.extensions', 'type_extensions'),
-            ]
+              ]
     clauses = []
 
     if buildID is not None:
@@ -4496,9 +4496,9 @@ def list_archives(buildID=None, buildrootID=None, componentBuildrootID=None, hos
         fields.append(['buildroot_archives.project_dep', 'project'])
     if imageID != None:
         # TODO: arg name is now a misnomer, could be any archive
-       clauses.append('archive_components.archive_id = %(imageID)i')
-       values['imageID'] = imageID
-       joins.append('archive_components ON archiveinfo.id = archive_components.component_id')
+        clauses.append('archive_components.archive_id = %(imageID)i')
+        values['imageID'] = imageID
+        joins.append('archive_components ON archiveinfo.id = archive_components.component_id')
     if hostID is not None:
         joins.append('standard_buildroot on archiveinfo.buildroot_id = standard_buildroot.buildroot_id')
         clauses.append('standard_buildroot.host_id = %(host_id)i')
@@ -4522,9 +4522,9 @@ def list_archives(buildID=None, buildrootID=None, componentBuildrootID=None, hos
     elif type == 'maven':
         joins.append('maven_archives ON archiveinfo.id = maven_archives.archive_id')
         fields.extend([
-                ('maven_archives.group_id', 'group_id'),
-                ('maven_archives.artifact_id', 'artifact_id'),
-                ('maven_archives.version', 'version'),
+            ('maven_archives.group_id', 'group_id'),
+            ('maven_archives.artifact_id', 'artifact_id'),
+            ('maven_archives.version', 'version'),
         ])
 
         if typeInfo:
@@ -4535,9 +4535,9 @@ def list_archives(buildID=None, buildrootID=None, componentBuildrootID=None, hos
     elif type == 'win':
         joins.append('win_archives ON archiveinfo.id = win_archives.archive_id')
         fields.extend([
-                ('win_archives.relpath', 'relpath'),
-                ('win_archives.platforms', 'platforms'),
-                ('win_archives.flags', 'flags'),
+            ('win_archives.relpath', 'relpath'),
+            ('win_archives.platforms', 'platforms'),
+            ('win_archives.flags', 'flags'),
         ])
 
         if typeInfo:
@@ -4566,14 +4566,14 @@ def list_archives(buildID=None, buildrootID=None, componentBuildrootID=None, hos
             raise koji.GenericError('unsupported archive type: %s' % type)
         if typeInfo:
             raise koji.GenericError('typeInfo queries not supported for type '
-                    '%(name)s' % btype)
+                                    '%(name)s' % btype)
         clauses.append('archiveinfo.btype_id = %(btype_id)s')
         values['btype_id'] = btype['id']
 
     columns, aliases = zip(*fields)
     ret = QueryProcessor(tables=tables, columns=columns, aliases=aliases, joins=joins,
-                          transform=_fix_archive_row,
-                          clauses=clauses, values=values, opts=queryOpts).execute()
+                         transform=_fix_archive_row,
+                         clauses=clauses, values=values, opts=queryOpts).execute()
     if strict and not ret:
         raise koji.GenericError('No archives found.')
     return ret
@@ -5116,13 +5116,13 @@ def query_buildroots(hostID=None, tagID=None, state=None, rpmID=None, archiveID=
 
     tables = ['buildroot']
     joins = ['LEFT OUTER JOIN standard_buildroot ON standard_buildroot.buildroot_id = buildroot.id',
-           'LEFT OUTER JOIN content_generator ON buildroot.cg_id = content_generator.id',
-           'LEFT OUTER JOIN host ON host.id = standard_buildroot.host_id',
-           'LEFT OUTER JOIN repo ON repo.id = standard_buildroot.repo_id',
-           'LEFT OUTER JOIN tag ON tag.id = repo.tag_id',
-           'LEFT OUTER JOIN events AS create_events ON create_events.id = standard_buildroot.create_event',
-           'LEFT OUTER JOIN events AS retire_events ON standard_buildroot.retire_event = retire_events.id',
-           'LEFT OUTER JOIN events AS repo_create ON repo_create.id = repo.create_event']
+             'LEFT OUTER JOIN content_generator ON buildroot.cg_id = content_generator.id',
+             'LEFT OUTER JOIN host ON host.id = standard_buildroot.host_id',
+             'LEFT OUTER JOIN repo ON repo.id = standard_buildroot.repo_id',
+             'LEFT OUTER JOIN tag ON tag.id = repo.tag_id',
+             'LEFT OUTER JOIN events AS create_events ON create_events.id = standard_buildroot.create_event',
+             'LEFT OUTER JOIN events AS retire_events ON standard_buildroot.retire_event = retire_events.id',
+             'LEFT OUTER JOIN events AS repo_create ON repo_create.id = repo.create_event']
 
     clauses = []
     if buildrootID != None:
@@ -5178,8 +5178,8 @@ def list_channels(hostID=None, event=None):
         tables = ['host_channels']
         joins = ['channels ON channels.id = host_channels.channel_id']
         clauses = [
-                eventCondition(event, table='host_channels'),
-                'host_channels.host_id = %(host_id)s']
+            eventCondition(event, table='host_channels'),
+            'host_channels.host_id = %(host_id)s']
         values = {'host_id': hostID}
         query = QueryProcessor(tables=tables, aliases=aliases,
                                columns=columns, joins=joins,
@@ -5231,7 +5231,7 @@ def remove_volume(volume):
     context.session.assertPerm('admin')
     volinfo = lookup_name('volume', volume, strict=True)
     query = QueryProcessor(tables=['build'], clauses=['volume_id=%(id)i'],
-                    values=volinfo, columns=['id'], opts={'limit':1})
+                           values=volinfo, columns=['id'], opts={'limit':1})
     if query.execute():
         raise koji.GenericError('volume %(name)s has build references' % volinfo)
     delete = """DELETE FROM volume WHERE id=%(id)i"""
@@ -5479,7 +5479,7 @@ def new_build(data, strict=False):
 
     # insert the new data
     insert_data = dslice(data, ['pkg_id', 'version', 'release', 'epoch', 'state', 'volume_id',
-                         'task_id', 'owner', 'start_time', 'completion_time', 'source', 'extra'])
+                                'task_id', 'owner', 'start_time', 'completion_time', 'source', 'extra'])
     if 'cg_id' in data:
         insert_data['cg_id'] = data['cg_id']
     data['id'] = insert_data['id'] = _singleValue("SELECT nextval('build_id_seq')")
@@ -5501,36 +5501,36 @@ def recycle_build(old, data):
             # the controlling task must have restarted (and called initBuild again)
             return
         raise koji.GenericError("Build already in progress (task %(task_id)d)"
-                                    % old)
+                                % old)
         # TODO? - reclaim 'stale' builds (state=BUILDING and task_id inactive)
 
     if st_desc not in ('FAILED', 'CANCELED'):
         raise koji.GenericError("Build already exists (id=%d, state=%s): %r"
-                % (old['id'], st_desc, data))
+                                % (old['id'], st_desc, data))
 
     # check for evidence of tag activity
     query = QueryProcessor(columns=['tag_id'], tables=['tag_listing'],
-                clauses = ['build_id = %(id)s'], values=old)
+                           clauses = ['build_id = %(id)s'], values=old)
     if query.execute():
         raise koji.GenericError("Build already exists. Unable to recycle, "
-                "has tag history")
+                                "has tag history")
 
     # check for rpms or archives
     query = QueryProcessor(columns=['id'], tables=['rpminfo'],
-                clauses = ['build_id = %(id)s'], values=old)
+                           clauses = ['build_id = %(id)s'], values=old)
     if query.execute():
         raise koji.GenericError("Build already exists. Unable to recycle, "
-                "has rpm data")
+                                "has rpm data")
     query = QueryProcessor(columns=['id'], tables=['archiveinfo'],
-                clauses = ['build_id = %(id)s'], values=old)
+                           clauses = ['build_id = %(id)s'], values=old)
     if query.execute():
         raise koji.GenericError("Build already exists. Unable to recycle, "
-                "has archive data")
+                                "has archive data")
 
-   # If we reach here, should be ok to replace
+    # If we reach here, should be ok to replace
 
     koji.plugin.run_callbacks('preBuildStateChange', attribute='state',
-                old=old['state'], new=data['state'], info=data)
+                              old=old['state'], new=data['state'], info=data)
 
     # If there is any old build type info, clear it
     delete = """DELETE FROM maven_builds WHERE build_id = %(id)i"""
@@ -5545,8 +5545,8 @@ def recycle_build(old, data):
     data['id'] = old['id']
     update = UpdateProcessor('build', clauses=['id=%(id)s'], values=data)
     update.set(**dslice(data,
-        ['state', 'task_id', 'owner', 'start_time', 'completion_time',
-         'epoch', 'source', 'extra', 'volume_id']))
+                        ['state', 'task_id', 'owner', 'start_time', 'completion_time',
+                         'epoch', 'source', 'extra', 'volume_id']))
     if 'cg_id' in data:
         update.set(cg_id=data['cg_id'])
     update.rawset(create_event='get_event()')
@@ -5556,7 +5556,7 @@ def recycle_build(old, data):
         koji.util.rmtree(builddir)
     buildinfo = get_build(data['id'], strict=True)
     koji.plugin.run_callbacks('postBuildStateChange', attribute='state',
-                old=old['state'], new=data['state'], info=buildinfo)
+                              old=old['state'], new=data['state'], info=buildinfo)
 
 
 def check_noarch_rpms(basepath, rpms, logs=None):
@@ -5640,13 +5640,13 @@ def import_build(srpm, rpms, brmap=None, task_id=None, build_id=None, logs=None)
     build['task_id'] = task_id
 
     policy_data = {
-            'package': build['name'],
-            'version': build['version'],
-            'release': build['release'],
-            'buildroots': to_list(brmap.values()),
-            'import': True,
-            'import_type': 'rpm',
-            }
+        'package': build['name'],
+        'version': build['version'],
+        'release': build['release'],
+        'buildroots': to_list(brmap.values()),
+        'import': True,
+        'import_type': 'rpm',
+    }
     vol = check_volume_policy(policy_data, strict=False, default='DEFAULT')
     build['volume_id'] = vol['id']
     build['volume_name'] = vol['name']
@@ -5666,7 +5666,7 @@ def import_build(srpm, rpms, brmap=None, task_id=None, build_id=None, logs=None)
                 raise koji.GenericError("Unable to complete build: %s mismatch (build: %s, rpm: %s)" % (key, binfo[key], build[key]))
         if binfo['state'] != koji.BUILD_STATES['BUILDING']:
             raise koji.GenericError("Unable to complete build: state is %s" \
-                    % koji.BUILD_STATES[binfo['state']])
+                                    % koji.BUILD_STATES[binfo['state']])
         # update build state
         update = UpdateProcessor('build', clauses=['id=%(id)s'], values=binfo)
         update.set(state=st_complete)
@@ -5708,7 +5708,7 @@ def import_rpm(fn, buildinfo=None, brootid=None, wrapper=False, fileinfo=None):
     # read rpm info
     hdr = koji.get_rpm_header(fn)
     rpminfo = koji.get_header_fields(hdr, ['name', 'version', 'release', 'epoch',
-                    'sourcepackage', 'arch', 'buildtime', 'sourcerpm'])
+                                           'sourcepackage', 'arch', 'buildtime', 'sourcerpm'])
     if rpminfo['sourcepackage'] == 1:
         rpminfo['arch'] = "src"
 
@@ -5746,10 +5746,10 @@ def import_rpm(fn, buildinfo=None, brootid=None, wrapper=False, fileinfo=None):
         if rpminfo['sourcepackage'] != 1:
             if rpminfo['sourcerpm'] != srpmname:
                 raise koji.GenericError("srpm mismatch for %s: %s (expected %s)" \
-                        % (fn, rpminfo['sourcerpm'], srpmname))
+                                        % (fn, rpminfo['sourcerpm'], srpmname))
         elif basename != srpmname:
             raise koji.GenericError("srpm mismatch for %s: %s (expected %s)" \
-                    % (fn, basename, srpmname))
+                                    % (fn, basename, srpmname))
 
     # if we're adding an rpm to it, then this build is of rpm type
     # harmless if build already has this type
@@ -5945,7 +5945,7 @@ class CG_Importer(object):
         self.check_build_dir()
 
         koji.plugin.run_callbacks('preImport', type='cg', metadata=metadata,
-                directory=directory)
+                                  directory=directory)
 
         # finalize import
         self.get_build(token)
@@ -6021,14 +6021,14 @@ class CG_Importer(object):
         """Use policy to determine what the volume should be"""
         # we have to be careful and provide sufficient data
         policy_data = {
-                'package': self.buildinfo['name'],
-                'version': self.buildinfo['version'],
-                'release': self.buildinfo['release'],
-                'source': self.buildinfo['source'],
-                'cg_list': list(self.cgs),
-                'import': True,
-                'import_type': 'cg',
-                }
+            'package': self.buildinfo['name'],
+            'version': self.buildinfo['version'],
+            'release': self.buildinfo['release'],
+            'source': self.buildinfo['source'],
+            'cg_list': list(self.cgs),
+            'import': True,
+            'import_type': 'cg',
+        }
         vol = check_volume_policy(policy_data, strict=False)
         if vol:
             self.buildinfo['volume_id'] = vol['id']
@@ -6332,19 +6332,19 @@ class CG_Importer(object):
         for key in ['nvr', 'filename']:
             if key not in comp:
                 raise koji.GenericError('%s field missing for component, '
-                        'archive_id=%s' % (key, archive['id']))
+                                        'archive_id=%s' % (key, archive['id']))
         expected = {
-                'nvr': build['nvr'],
-                'filename': archive['filename'],
-                'filesize': int(archive['size']),
-                'checksum': archive['checksum'],
-                'checksum_type': koji.CHECKSUM_TYPES[archive['checksum_type']],
-                }
+            'nvr': build['nvr'],
+            'filename': archive['filename'],
+            'filesize': int(archive['size']),
+            'checksum': archive['checksum'],
+            'checksum_type': koji.CHECKSUM_TYPES[archive['checksum_type']],
+        }
         for key in expected:
             if key in comp and expected[key] != comp[key]:
                 raise koji.GenericError('Component field %s does not match for '
-                    'archive_id=%s: %s != %s' % (key, archive['id'],
-                        expected[key], comp[key]))
+                                        'archive_id=%s: %s != %s' % (key, archive['id'],
+                                                                     expected[key], comp[key]))
         return archive
 
     def prep_outputs(self):
@@ -6361,7 +6361,7 @@ class CG_Importer(object):
             filesize = os.path.getsize(path)
             if filesize != fileinfo['filesize']:
                 raise koji.GenericError("File size %s for %s (expected %s) doesn't match. Corrupted upload?" %
-                        (filesize, fileinfo['filename'], fileinfo['filesize']))
+                                        (filesize, fileinfo['filename'], fileinfo['filesize']))
 
             # checksum
             if fileinfo['checksum_type'] != 'md5':
@@ -6377,7 +6377,7 @@ class CG_Importer(object):
                     m.update(contents)
                 if fileinfo['checksum'] != m.hexdigest():
                     raise koji.GenericError("File checksum mismatch for %s: %s != %s" %
-                            (fileinfo['filename'], fileinfo['checksum'], m.hexdigest()))
+                                            (fileinfo['filename'], fileinfo['checksum'], m.hexdigest()))
             fileinfo['hub.checked_md5'] = True
 
             if fileinfo['buildroot_id'] not in self.br_prep:
@@ -6417,7 +6417,7 @@ class CG_Importer(object):
                 continue
             if btype is not None:
                 raise koji.GenericError("Output file has multiple types: "
-                    "%(filename)s" % fileinfo)
+                                        "%(filename)s" % fileinfo)
             btype = key
             type_info = extra[key]
         for key in extra.get('typeinfo', {}):
@@ -6425,7 +6425,7 @@ class CG_Importer(object):
                 raise koji.GenericError("Duplicate typeinfo for: %r" % btype)
             elif btype is not None:
                 raise koji.GenericError("Output file has multiple types: "
-                    "%(filename)s" % fileinfo)
+                                        "%(filename)s" % fileinfo)
             btype = key
             type_info = extra['typeinfo'][key]
 
@@ -6434,7 +6434,7 @@ class CG_Importer(object):
 
         if btype not in self.typeinfo:
             raise koji.GenericError('Output type %s not listed in build '
-                        'types' % btype)
+                                    'types' % btype)
 
         fileinfo['hub.btype'] = btype
         fileinfo['hub.type_info'] = type_info
@@ -6442,7 +6442,7 @@ class CG_Importer(object):
         if 'components' in fileinfo:
             if btype in ('maven', 'win'):
                 raise koji.GenericError("Component list not allowed for "
-                        "archives of type %s" % btype)
+                                        "archives of type %s" % btype)
             # for new types, we trust the metadata
             components = fileinfo['components']
             rpmlist, archives = self.match_components(components)
@@ -6545,7 +6545,7 @@ def add_external_rpm(rpminfo, external_repo, strict=True):
                 raise koji.GenericError("external rpm already exists: %s" % disp)
             elif data['payloadhash'] != previous['payloadhash']:
                 raise koji.GenericError("hash changed for external rpm: %s (%s -> %s)" \
-                        % (disp, previous['payloadhash'], data['payloadhash']))
+                                        % (disp, previous['payloadhash'], data['payloadhash']))
             else:
                 return previous
 
@@ -6642,7 +6642,7 @@ def merge_scratch(task_id):
                 else:
                     if srpm != srpm_name:
                         raise koji.ImportError('task srpm names do not match: %s, %s' % \
-                              (srpm, srpm_name))
+                                               (srpm, srpm_name))
             elif output.endswith('.noarch.rpm'):
                 continue
             elif output.endswith('.rpm'):
@@ -6651,7 +6651,7 @@ def merge_scratch(task_id):
                     info['arch'] = rpminfo['arch']
                 elif info['arch'] != rpminfo['arch']:
                     raise koji.ImportError('multiple arches generated by task %s: %s, %s' % \
-                          (child['id'], info['arch'], rpminfo['arch']))
+                                           (child['id'], info['arch'], rpminfo['arch']))
                 info['rpms'].append(output)
             elif output.endswith('.log'):
                 info['logs'].append(output)
@@ -6673,7 +6673,7 @@ def merge_scratch(task_id):
     build = get_build(build_nvr)
     if not build:
         raise koji.ImportError('no such build: %(name)s-%(version)s-%(release)s' % \
-              build_nvr)
+                               build_nvr)
     if build['state'] != koji.BUILD_STATES['COMPLETE']:
         raise koji.ImportError('%s did not complete successfully' % build['nvr'])
     if not build['task_id']:
@@ -6686,14 +6686,14 @@ def merge_scratch(task_id):
     # compare the task and build and make sure they are compatible with importing
     if task_info['request'][0] != build_task_info['request'][0]:
         raise koji.ImportError('SCM URLs for the task and build do not match: %s, %s' % \
-              (task_info['request'][0], build_task_info['request'][0]))
+                               (task_info['request'][0], build_task_info['request'][0]))
     build_arches = set()
     for rpminfo in list_rpms(buildID=build['id']):
         if rpminfo['arch'] == 'src':
             build_srpm = '%s.src.rpm' % rpminfo['nvr']
             if srpm != build_srpm:
                 raise koji.ImportError('task and build srpm names do not match: %s, %s' % \
-                      (srpm, build_srpm))
+                                       (srpm, build_srpm))
         elif rpminfo['arch'] == 'noarch':
             continue
         else:
@@ -6704,7 +6704,7 @@ def merge_scratch(task_id):
     overlapping_arches = task_arches.intersection(build_arches)
     if overlapping_arches:
         raise koji.ImportError('task %s and %s produce rpms with the same arches: %s' % \
-              (task_info['id'], build['nvr'], ', '.join(overlapping_arches)))
+                               (task_info['id'], build['nvr'], ', '.join(overlapping_arches)))
 
     # everything looks good, do the import
     for task_id, info in tasks.items():
@@ -6756,10 +6756,10 @@ def get_archive_type(filename=None, type_name=None, type_id=None, strict=False):
 
     parts = filename.split('.')
     query = QueryProcessor(
-            tables=['archivetypes'],
-            columns=['id', 'name', 'description', 'extensions'],
-            clauses=['extensions ~* %(pattern)s'],
-            )
+        tables=['archivetypes'],
+        columns=['id', 'name', 'description', 'extensions'],
+        clauses=['extensions ~* %(pattern)s'],
+    )
     for start in range(len(parts)-1, -1, -1):
         ext = '.'.join(parts[start:])
         query.values['pattern'] = r'(\s|^)%s(\s|$)' % ext
@@ -6791,7 +6791,7 @@ def add_archive_type(name, description, extensions):
     data = {'name': name,
             'description': description,
             'extensions': extensions,
-    }
+            }
     if get_archive_type(type_name=name):
         raise koji.GenericError("archivetype %s already exists" % name)
     # No invalid or duplicate extensions
@@ -6821,7 +6821,7 @@ def new_maven_build(build, maven_info):
         for field in ('group_id', 'artifact_id', 'version'):
             if current_maven_info[field] != maven_info[field]:
                 raise koji.BuildError('%s mismatch (current: %s, new: %s)' % \
-                    (field, current_maven_info[field], maven_info[field]))
+                                      (field, current_maven_info[field], maven_info[field]))
     else:
         maven_info['build_id'] = build['id']
         data = dslice(maven_info, ['build_id', 'group_id', 'artifact_id', 'version'])
@@ -6955,14 +6955,14 @@ def import_archive_internal(filepath, buildinfo, type, typeInfo, buildroot_id=No
             # check against metadata
             if archiveinfo['size'] != fileinfo['filesize']:
                 raise koji.GenericError("File size mismatch for %s: %s != %s" %
-                        (filename, archiveinfo['size'], fileinfo['filesize']))
+                                        (filename, archiveinfo['size'], fileinfo['filesize']))
             if fileinfo['checksum_type'] != 'md5':
                 # XXX
                 # until we change the way we handle checksums, we have to limit this to md5
                 raise koji.GenericError("Unsupported checksum type: %(checksum_type)s" % fileinfo)
             if archiveinfo['checksum'] != fileinfo['checksum']:
                 raise koji.GenericError("File checksum mismatch for %s: %s != %s" %
-                        (filename, archiveinfo['checksum'], fileinfo['checksum']))
+                                        (filename, archiveinfo['checksum'], fileinfo['checksum']))
     archivetype = get_archive_type(filename, strict=True)
     archiveinfo['type_id'] = archivetype['id']
     btype = lookup_name('btype', type, strict=False)
@@ -6995,11 +6995,11 @@ def import_archive_internal(filepath, buildinfo, type, typeInfo, buildroot_id=No
             # sanity check: Maven info from pom must match the user-supplied typeInfo
             if koji.mavenLabel(pom_maveninfo) != koji.mavenLabel(typeInfo):
                 raise koji.BuildError('Maven info from .pom file (%s) does not match user-supplied typeInfo (%s)' % \
-                    (koji.mavenLabel(pom_maveninfo), koji.mavenLabel(typeInfo)))
+                                      (koji.mavenLabel(pom_maveninfo), koji.mavenLabel(typeInfo)))
             # sanity check: the filename of the pom file must match <artifactId>-<version>.pom
             if filename != '%(artifact_id)s-%(version)s.pom' % typeInfo:
                 raise koji.BuildError('Maven info (%s) is not consistent with pom filename (%s)' % \
-                      (koji.mavenLabel(typeInfo), filename))
+                                      (koji.mavenLabel(typeInfo), filename))
 
         insert = InsertProcessor('maven_archives', data=dslice(typeInfo, ('group_id', 'artifact_id', 'version')))
         insert.set(archive_id=archive_id)
@@ -7097,7 +7097,7 @@ def add_rpm_sig(an_rpm, sighdr):
     rinfo = get_rpm(an_rpm, strict=True)
     if rinfo['external_repo_id']:
         raise koji.GenericError("Not an internal rpm: %s (from %s)" \
-                % (an_rpm, rinfo['external_repo_name']))
+                                % (an_rpm, rinfo['external_repo_name']))
     binfo = get_build(rinfo['build_id'])
     builddir = koji.pathinfo.build(binfo)
     if not os.path.isdir(builddir):
@@ -7212,7 +7212,7 @@ def check_rpm_sig(an_rpm, sigkey, sighdr):
         found_key = koji.get_sigpacket_key_id(raw_key)
     if sigkey != found_key:
         raise koji.GenericError("Signature key mismatch: got %s, expected %s" \
-                              % (found_key, sigkey))
+                                % (found_key, sigkey))
     os.unlink(temp)
 
 
@@ -7233,7 +7233,7 @@ def write_signed_rpm(an_rpm, sigkey, force=False):
     rinfo = get_rpm(an_rpm, strict=True)
     if rinfo['external_repo_id']:
         raise koji.GenericError("Not an internal rpm: %s (from %s)" \
-                % (an_rpm, rinfo['external_repo_name']))
+                                % (an_rpm, rinfo['external_repo_name']))
     binfo = get_build(rinfo['build_id'])
     nvra = "%(name)s-%(version)s-%(release)s.%(arch)s" % rinfo
     builddir = koji.pathinfo.build(binfo)
@@ -7303,19 +7303,19 @@ def query_history(tables=None, **kwargs):
         'revoke_event': 'revoke_event',
         'creator_id': 'creator_id',
         'revoker_id': 'revoker_id',
-        }
+    }
     common_joins = [
         "events AS ev1 ON ev1.id = create_event",
         "LEFT OUTER JOIN events AS ev2 ON ev2.id = revoke_event",
         "users AS creator ON creator.id = creator_id",
         "LEFT OUTER JOIN users AS revoker ON revoker.id = revoker_id",
-        ]
+    ]
     common_joined_fields = {
         'creator.name': 'creator_name',
         'revoker.name': 'revoker_name',
         'EXTRACT(EPOCH FROM ev1.time) AS create_ts': 'create_ts',
         'EXTRACT(EPOCH FROM ev2.time) AS revoke_ts': 'revoke_ts',
-        }
+    }
     table_fields = {
         'user_perms': ['user_id', 'perm_id'],
         'user_groups': ['user_id', 'group_id'],
@@ -7332,10 +7332,10 @@ def query_history(tables=None, **kwargs):
         'tag_packages': ['package_id', 'tag_id', 'blocked', 'extra_arches'],
         'tag_package_owners': ['package_id', 'tag_id', 'owner'],
         'group_config': ['group_id', 'tag_id', 'blocked', 'exported', 'display_name', 'is_default', 'uservisible',
-                            'description', 'langonly', 'biarchonly'],
+                         'description', 'langonly', 'biarchonly'],
         'group_req_listing': ['group_id', 'tag_id', 'req_id', 'blocked', 'type', 'is_metapkg'],
         'group_package_listing': ['group_id', 'tag_id', 'package', 'blocked', 'type', 'basearchonly', 'requires'],
-        }
+    }
     name_joins = {
         # joins triggered by table fields for name lookup
         # field : [table, join-alias, alias]
@@ -7355,7 +7355,7 @@ def query_history(tables=None, **kwargs):
         'package_id': ['package'],
         'owner': ['users', 'owner'],
         'req_id': ['groups', 'req'],
-        }
+    }
     if tables is None:
         tables = sorted(table_fields.keys())
     else:
@@ -7563,12 +7563,12 @@ def tag_history(build=None, tag=None, package=None, active=None, queryOpts=None)
               'EXTRACT(EPOCH FROM ev1.time)', 'EXTRACT(EPOCH FROM ev2.time)',
               'maven_builds.build_id', 'win_builds.build_id')
     aliases = ('build_id', 'name', 'version', 'release',
-              'tag_id', 'tag_name', 'active',
-              'create_event', 'revoke_event',
-              'creator_id', 'revoker_id',
-              'creator_name', 'revoker_name',
-              'create_ts', 'revoke_ts',
-              'maven_build_id', 'win_build_id')
+               'tag_id', 'tag_name', 'active',
+               'create_event', 'revoke_event',
+               'creator_id', 'revoker_id',
+               'creator_name', 'revoker_name',
+               'create_ts', 'revoke_ts',
+               'maven_build_id', 'win_build_id')
     st_complete = koji.BUILD_STATES['COMPLETE']
     tables = ['tag_listing']
     joins = ["tag ON tag.id = tag_listing.tag_id",
@@ -7691,7 +7691,7 @@ def build_references(build_id, limit=None, lazy=False):
     if limit:
         qopts['limit'] = limit
     query = QueryProcessor(columns=fields, tables=['archive_rpm_components'],
-            clauses=clauses, joins=joins, values=values, opts=qopts)
+                           clauses=clauses, joins=joins, values=values, opts=qopts)
     for (rpm_id,) in build_rpm_ids:
         query.values['rpm_id'] = rpm_id
         archive_ids = [i[0] for i in query.execute()]
@@ -7733,7 +7733,7 @@ def build_references(build_id, limit=None, lazy=False):
     if limit:
         qopts['limit'] = limit
     query = QueryProcessor(columns=fields, tables=['archive_components'],
-            clauses=clauses, joins=joins, values=values, opts=qopts)
+                           clauses=clauses, joins=joins, values=values, opts=qopts)
     for (archive_id,) in build_archive_ids:
         query.values['archive_id'] = archive_id
         archive_ids = [i[0] for i in query.execute()]
@@ -8037,7 +8037,7 @@ def get_notification_recipients(build, tag_id, state):
         recipients.append({
             'user_id': build['owner_id'],
             'email': '%s@%s' % (build['owner_name'], email_domain)
-            })
+        })
 
         if tag_id:
             packages = readPackageList(pkgID=package_id, tagID=tag_id, inherit=True)
@@ -8052,7 +8052,7 @@ def get_notification_recipients(build, tag_id, state):
                     recipients.append({
                         'user_id': owner['id'],
                         'email': '%s@%s' % (owner['name'], email_domain)
-                        })
+                    })
         # FIXME - if tag_id is None, we don't have a good way to get the package owner.
         #   using all package owners from all tags would be way overkill.
 
@@ -8073,7 +8073,7 @@ def get_notification_recipients(build, tag_id, state):
         else:
             clauses.append('tag_id IS NULL')
         query = QueryProcessor(columns=['user_id'], clauses=clauses,
-                tables=['build_notifications_block'], values=locals())
+                               tables=['build_notifications_block'], values=locals())
         optouts = [r['user_id'] for r in query.execute()]
         optouts = set(optouts)
     else:
@@ -8307,7 +8307,7 @@ def revoke_cg_access(user, cg):
     cg = lookup_name('content_generator', cg, strict=True)
     data = {'user_id': user['id'], 'cg_id' : cg['id']}
     update = UpdateProcessor('cg_users', values=data,
-                clauses=["user_id = %(user_id)i", "cg_id = %(cg_id)i"])
+                             clauses=["user_id = %(user_id)i", "cg_id = %(cg_id)i"])
     update.make_revoke()
     update.execute()
 
@@ -8691,7 +8691,7 @@ class QueryProcessor(object):
 
     def __str__(self):
         query = \
-"""
+            """
 SELECT %(col_str)s
   FROM %(table_str)s
 %(join_str)s
@@ -9012,7 +9012,7 @@ def policy_get_cgs(data):
     # note that br_id will be None if a component had no buildroot
     if 'cg_list' in data:
         cgs = [lookup_name('content_generator', cg, strict=True)
-                for cg in data['cg_list']]
+               for cg in data['cg_list']]
         return set(cgs)
     # otherwise try buildroot data
     cgs = set()
@@ -9489,7 +9489,7 @@ def rpmdiff(basepath, rpmlist, hashes):
         # (files may have been generated at build time and contain
         #  embedded dates or other insignificant differences)
         d = koji.rpmdiff.Rpmdiff(joinpath(basepath, first_rpm),
-            joinpath(basepath, other_rpm), ignore='S5TN')
+                                 joinpath(basepath, other_rpm), ignore='S5TN')
         if d.differs():
             raise koji.BuildError(
                 'The following noarch package built differently on different architectures: %s\n'
@@ -9791,7 +9791,7 @@ class RootExports(object):
             if priority < 0:
                 if not context.session.hasPerm('admin'):
                     raise koji.ActionNotAllowed(
-                               'only admins may create high-priority tasks')
+                        'only admins may create high-priority tasks')
 
             taskOpts['priority'] = koji.PRIO_DEFAULT + priority
 
@@ -9809,7 +9809,7 @@ class RootExports(object):
             if priority < 0:
                 if not context.session.hasPerm('admin'):
                     raise koji.ActionNotAllowed(
-                               'only admins may create high-priority tasks')
+                        'only admins may create high-priority tasks')
 
             taskOpts['priority'] = koji.PRIO_DEFAULT + priority
         if 'scratch' not in opts and 'indirection_template_url' not in opts:
@@ -9831,7 +9831,7 @@ class RootExports(object):
             if priority < 0:
                 if not context.session.hasPerm('admin'):
                     raise koji.ActionNotAllowed(
-                               'only admins may create high-priority tasks')
+                        'only admins may create high-priority tasks')
 
             taskOpts['priority'] = koji.PRIO_DEFAULT + priority
         if 'scratch' not in opts and 'ksurl' not in opts:
@@ -10103,7 +10103,7 @@ class RootExports(object):
     deleteExternalRepo = staticmethod(delete_external_repo)
 
     def addExternalRepoToTag(self, tag_info, repo_info, priority,
-                merge_mode='koji'):
+                             merge_mode='koji'):
         """Add an external repo to a tag"""
         # wrap the local method so we don't expose the event parameter
         add_external_repo_to_tag(tag_info, repo_info, priority, merge_mode)
@@ -10848,7 +10848,7 @@ class RootExports(object):
                 raise koji.GenericError('unsupported build type: %s' % type)
             btype_id = btype['id']
             joins.append('build_types ON build.id = build_types.build_id '
-                    'AND btype_id = %(btype_id)s')
+                         'AND btype_id = %(btype_id)s')
 
         query = QueryProcessor(columns=[pair[0] for pair in fields],
                                aliases=[pair[1] for pair in fields],
@@ -11241,8 +11241,8 @@ class RootExports(object):
             if pkgID is not None:
                 pkgID = get_package_id(pkgID, strict=True)
             result_list = list(readPackageList(tagID=tagID, userID=userID, pkgID=pkgID,
-                                          inherit=inherited, with_dups=with_dups,
-                                          event=event).values())
+                                               inherit=inherited, with_dups=with_dups,
+                                               event=event).values())
             if with_dups:
                 # when with_dups=True, readPackageList returns a list of list of dicts
                 # convert it to a list of dicts for consistency
@@ -11273,7 +11273,7 @@ class RootExports(object):
             'package_name' and 'package_id'.
         """
         fields = (('package.id', 'package_id'),
-                      ('package.name', 'package_name'))
+                  ('package.name', 'package_name'))
         if prefix is None:
             clauses = None
         else:
@@ -11332,7 +11332,7 @@ class RootExports(object):
         if perm['name'] not in koji.auth.get_user_perms(user_id):
             raise koji.GenericError('user %s does not have permission: %s' % (userinfo, perm['name']))
         update = UpdateProcessor('user_perms', values=locals(),
-                    clauses=["user_id = %(user_id)i", "perm_id = %(perm_id)i"])
+                                 clauses=["user_id = %(user_id)i", "perm_id = %(perm_id)i"])
         update.make_revoke()
         update.execute()
 
@@ -11483,11 +11483,11 @@ class RootExports(object):
         build_config = self.getBuildConfig(tag)
         if build_config['extra'].get('distrepo.cancel_others', False):
             tasks = self.listTasks(opts={
-                                       'state': [koji.TASK_STATES['FREE'],
-                                                 koji.TASK_STATES['OPEN'],
-                                                 koji.TASK_STATES['ASSIGNED']],
-                                       'method': 'distRepo',
-                                       'decode': True})
+                'state': [koji.TASK_STATES['FREE'],
+                          koji.TASK_STATES['OPEN'],
+                          koji.TASK_STATES['ASSIGNED']],
+                'method': 'distRepo',
+                'decode': True})
             # filter only for this tag
             task_ids = [t['id'] for t in tasks if t['request'][0] == tag]
             for task_id in task_ids:
@@ -11662,14 +11662,14 @@ class RootExports(object):
         else:
             joins = ['LEFT JOIN users ON task.owner = users.id']
         flist = Task.fields + (
-                    ('task.request', 'request'),
-                    ('task.result', 'result'),
-                    )
+            ('task.request', 'request'),
+            ('task.result', 'result'),
+        )
         if not countOnly:
             flist += (
-                    ('users.name', 'owner_name'),
-                    ('users.usertype', 'owner_type'),
-                    )
+                ('users.name', 'owner_name'),
+                ('users.usertype', 'owner_type'),
+            )
         fields = [f[0] for f in flist]
         aliases = [f[1] for f in flist]
 
@@ -11705,16 +11705,16 @@ class RootExports(object):
             conditions.append('method = %(method)s')
 
         time_opts = [
-                ['createdBefore', 'create_time', '<'],
-                ['createdAfter', 'create_time', '>'],
-                ['startedBefore', 'start_time', '<'],
-                ['startedAfter', 'start_time', '>'],
-                ['completeBefore', 'completion_time', '<'],
-                ['completeAfter', 'completion_time', '>'],
-                # and a couple aliases for api compat:
-                ['completedBefore', 'completion_time', '<'],
-                ['completedAfter', 'completion_time', '>'],
-            ]
+            ['createdBefore', 'create_time', '<'],
+            ['createdAfter', 'create_time', '>'],
+            ['startedBefore', 'start_time', '<'],
+            ['startedAfter', 'start_time', '>'],
+            ['completeBefore', 'completion_time', '<'],
+            ['completeAfter', 'completion_time', '>'],
+            # and a couple aliases for api compat:
+            ['completedBefore', 'completion_time', '<'],
+            ['completedAfter', 'completion_time', '>'],
+        ]
         for key, field, cmp in time_opts:
             if opts.get(key) != None:
                 value = opts[key]
@@ -11919,20 +11919,20 @@ class RootExports(object):
             clauses.append('user_id = %(userID)i')
 
         fields = {'host.id': 'id',
-              'host.user_id': 'user_id',
-              'host.name': 'name',
-              'host.ready': 'ready',
-              'host.task_load': 'task_load',
-              'host_config.arches': 'arches',
-              'host_config.capacity': 'capacity',
-              'host_config.description': 'description',
-              'host_config.comment': 'comment',
-              'host_config.enabled': 'enabled',
-              }
+                  'host.user_id': 'user_id',
+                  'host.name': 'name',
+                  'host.ready': 'ready',
+                  'host.task_load': 'task_load',
+                  'host_config.arches': 'arches',
+                  'host_config.capacity': 'capacity',
+                  'host_config.description': 'description',
+                  'host_config.comment': 'comment',
+                  'host_config.enabled': 'enabled',
+                  }
         tables = ['host_config']
         fields, aliases = zip(*fields.items())
         query = QueryProcessor(columns=fields, aliases=aliases,
-                tables=tables, joins=joins, clauses=clauses, values=locals())
+                               tables=tables, joins=joins, clauses=clauses, values=locals())
         return query.execute()
 
     def getLastHostUpdate(self, hostID):
@@ -12203,7 +12203,7 @@ class RootExports(object):
         orig_notif = self.getBuildNotification(id, strict=True)
         if not (orig_notif['user_id'] == currentUser['id'] or self.hasPerm('admin')):
             raise koji.GenericError('user %i cannot update notifications for user %i' % \
-                  (currentUser['id'], orig_notif['user_id']))
+                                    (currentUser['id'], orig_notif['user_id']))
 
         # sanitize input
         if package_id is not None:
@@ -12216,7 +12216,7 @@ class RootExports(object):
         for notification in get_build_notifications(orig_notif['user_id']):
             if (notification['package_id'] == package_id and
                 notification['tag_id'] == tag_id and
-                notification['success_only'] == success_only):
+                    notification['success_only'] == success_only):
                 raise koji.GenericError('notification already exists')
 
         update = UpdateProcessor('build_notifications',
@@ -12237,7 +12237,7 @@ class RootExports(object):
 
         if not (notificationUser['id'] == currentUser['id'] or self.hasPerm('admin')):
             raise koji.GenericError('user %s cannot create notifications for user %s' % \
-                  (currentUser['name'], notificationUser['name']))
+                                    (currentUser['name'], notificationUser['name']))
 
         # sanitize input
         user_id = notificationUser['id']
@@ -12253,7 +12253,7 @@ class RootExports(object):
         for notification in get_build_notifications(user_id):
             if (notification['package_id'] == package_id and
                 notification['tag_id'] == tag_id and
-                notification['success_only'] == success_only):
+                    notification['success_only'] == success_only):
                 raise koji.GenericError('notification already exists')
 
         insert = InsertProcessor('build_notifications')
@@ -12272,7 +12272,7 @@ class RootExports(object):
         if not (notification['user_id'] == currentUser['id'] or
                 self.hasPerm('admin')):
             raise koji.GenericError('user %i cannot delete notifications for user %i' % \
-                  (currentUser['id'], notification['user_id']))
+                                    (currentUser['id'], notification['user_id']))
         delete = """DELETE FROM build_notifications WHERE id = %(id)i"""
         _dml(delete, locals())
 
@@ -12290,7 +12290,7 @@ class RootExports(object):
 
         if not (notificationUser['id'] == currentUser['id'] or self.hasPerm('admin')):
             raise koji.GenericError('user %s cannot create notification blocks for user %s' % \
-                  (currentUser['name'], notificationUser['name']))
+                                    (currentUser['name'], notificationUser['name']))
 
         # sanitize input
         user_id = notificationUser['id']
@@ -12319,7 +12319,7 @@ class RootExports(object):
         if not (block['user_id'] == currentUser['id'] or
                 self.hasPerm('admin')):
             raise koji.GenericError('user %i cannot delete notification blocks for user %i' % \
-                  (currentUser['id'], block['user_id']))
+                                    (currentUser['id'], block['user_id']))
         delete = """DELETE FROM build_notifications_block WHERE id = %(id)i"""
         _dml(delete, locals())
 
@@ -12443,10 +12443,10 @@ class BuildRoot(object):
             'host_os',
             'host_arch',
             'extra',
-            ]
+        ]
         query = QueryProcessor(columns=fields, tables=['buildroot'],
-                    transform=_fix_extra_field,
-                    values={'id': id}, clauses=['id=%(id)s'])
+                               transform=_fix_extra_field,
+                               values={'id': id}, clauses=['id=%(id)s'])
         data = query.executeOne()
         if not data:
             raise koji.GenericError('no buildroot with ID: %i' % id)
@@ -12465,9 +12465,9 @@ class BuildRoot(object):
             'create_event',
             'retire_event',
             'state',
-            ]
+        ]
         query = QueryProcessor(columns=fields, tables=['standard_buildroot'],
-                    values={'id': self.id}, clauses=['buildroot_id=%(id)s'])
+                               values={'id': self.id}, clauses=['buildroot_id=%(id)s'])
         data = query.executeOne()
         if not data:
             raise koji.GenericError('Not a standard buildroot: %i' % self.id)
@@ -12503,7 +12503,7 @@ class BuildRoot(object):
             'host_os',
             'host_arch',
             'extra',
-            ]
+        ]
         data.setdefault('br_type', koji.BR_TYPES['EXTERNAL'])
         data = dslice(data, fields)
         for key in fields:
@@ -12553,8 +12553,8 @@ class BuildRoot(object):
             # we do not re-init buildroots
             raise koji.GenericError("Cannot change buildroot state to INIT")
         query = QueryProcessor(columns=['state', 'retire_event'], values=self.data,
-                    tables=['standard_buildroot'], clauses=['buildroot_id=%(id)s'],
-                    opts={'rowlock':True})
+                               tables=['standard_buildroot'], clauses=['buildroot_id=%(id)s'],
+                               opts={'rowlock':True})
         row = query.executeOne()
         if not row:
             raise koji.GenericError("Unable to get state for buildroot %s" % self.id)
@@ -12589,12 +12589,12 @@ class BuildRoot(object):
             ('build_id', 'build_id'),
             ('external_repo_id', 'external_repo_id'),
             ('external_repo.name', 'external_repo_name'),
-            )
+        )
         query = QueryProcessor(columns=[f[0] for f in fields], aliases=[f[1] for f in fields],
-                        tables=['buildroot_listing'],
-                        joins=["rpminfo ON rpm_id = rpminfo.id", "external_repo ON external_repo_id = external_repo.id"],
-                        clauses=["buildroot_listing.buildroot_id = %(brootid)i"],
-                        values=locals())
+                               tables=['buildroot_listing'],
+                               joins=["rpminfo ON rpm_id = rpminfo.id", "external_repo ON external_repo_id = external_repo.id"],
+                               clauses=["buildroot_listing.buildroot_id = %(brootid)i"],
+                               values=locals())
         return query.execute()
 
     def _setList(self, rpmlist, update=False):
@@ -12655,7 +12655,7 @@ class BuildRoot(object):
                   ('checksum', 'checksum'),
                   ('checksum_type', 'checksum_type'),
                   ('project_dep', 'project_dep'),
-                 ]
+                  ]
         columns, aliases = zip(*fields)
         query = QueryProcessor(tables=tables, columns=columns,
                                joins=joins, clauses=clauses,
@@ -12754,7 +12754,7 @@ class Host(object):
             update.execute()
             # clear awaited flag on any other child tasks
             update = UpdateProcessor('task', values=locals(),
-                            clauses=['id NOT IN %(tasks)s', 'parent=%(parent)s', 'awaited=true'])
+                                     clauses=['id NOT IN %(tasks)s', 'parent=%(parent)s', 'awaited=true'])
             update.set(awaited=False)
             update.execute()
         else:
@@ -12807,8 +12807,8 @@ class Host(object):
             states = tuple([koji.TASK_STATES[s]
                             for s in ['CLOSED', 'FAILED','CANCELED']])
             query = QueryProcessor(tables=['task'], columns=['id'],
-                        clauses=['parent=%(parent)s', 'state in %(states)s'],
-                        values=locals(), opts={'asList': True})
+                                   clauses=['parent=%(parent)s', 'state in %(states)s'],
+                                   values=locals(), opts={'asList': True})
             tasks = [r[0] for r in query.execute()]
         # Would use a dict, but xmlrpc requires the keys to be strings
         results = []
@@ -13150,7 +13150,7 @@ class HostExports(object):
             scratchdir = koji.pathinfo.scratch()
             username = get_user(task.getOwner())['name']
             destdir = joinpath(scratchdir, username,
-                'task_%s' % sub_results['task_id'])
+                               'task_%s' % sub_results['task_id'])
             for img in sub_results['files'] + sub_results['logs']:
                 src = joinpath(workdir, img)
                 dest = joinpath(destdir, img)
@@ -13211,11 +13211,11 @@ class HostExports(object):
         # check volume policy
         vol_update = False
         policy_data = {
-                'build': build_info,
-                'package': build_info['name'],
-                'import': True,
-                'import_type': 'maven',
-                }
+            'build': build_info,
+            'package': build_info['name'],
+            'import': True,
+            'import_type': 'maven',
+        }
         vol = check_volume_policy(policy_data, strict=False, default='DEFAULT')
         if vol['id'] != build_info['volume_id']:
             build_info['volume_id'] = vol['id']
@@ -13291,11 +13291,11 @@ class HostExports(object):
         # check volume policy
         vol_update = False
         policy_data = {
-                'build': build_info,
-                'package': build_info['name'],
-                'import': True,
-                'import_type': 'maven',
-                }
+            'build': build_info,
+            'package': build_info['name'],
+            'import': True,
+            'import_type': 'maven',
+        }
         vol = check_volume_policy(policy_data, strict=False, default='DEFAULT')
         if vol['id'] != build_info['volume_id']:
             build_info['volume_id'] = vol['id']
@@ -13400,7 +13400,7 @@ class HostExports(object):
 
         if build_info['state'] != koji.BUILD_STATES['COMPLETE']:
             raise koji.GenericError('cannot import wrapper rpms for %s: build state is %s, not complete' % \
-                (koji.buildLabel(build_info), koji.BUILD_STATES[build_info['state']].lower()))
+                                    (koji.buildLabel(build_info), koji.BUILD_STATES[build_info['state']].lower()))
 
         if list_rpms(buildID=build_info['id']):
             # don't allow overwriting of already-imported wrapper RPMs
@@ -13461,11 +13461,11 @@ class HostExports(object):
         # check volume policy
         vol_update = False
         policy_data = {
-                'build': build_info,
-                'package': build_info['name'],
-                'import': True,
-                'import_type': 'win',
-                }
+            'build': build_info,
+            'package': build_info['name'],
+            'import': True,
+            'import_type': 'win',
+        }
         vol = check_volume_policy(policy_data, strict=False, default='DEFAULT')
         if vol['id'] != build_info['volume_id']:
             build_info['volume_id'] = vol['id']
@@ -13536,10 +13536,10 @@ class HostExports(object):
 
         if result['state'] != koji.BUILD_STATES['BUILDING']:
             raise koji.GenericError('cannot update build %i, state: %s' % \
-                  (build_id, koji.BUILD_STATES[result['state']]))
+                                    (build_id, koji.BUILD_STATES[result['state']]))
         elif result['completion_time'] is not None:
             raise koji.GenericError('cannot update build %i, completed at %s' % \
-                  (build_id, result['completion_time']))
+                                    (build_id, result['completion_time']))
 
         update = """UPDATE build
         SET state = %(st_failed)i,
@@ -13608,7 +13608,7 @@ class HostExports(object):
             if 'rpmresults' in sub_results:
                 rpm_results = sub_results['rpmresults']
                 _import_wrapper(rpm_results['task_id'],
-                    get_build(build_id, strict=True), rpm_results)
+                                get_build(build_id, strict=True), rpm_results)
 
     def tagNotification(self, is_successful, tag_id, from_id, build_id, user_id, ignore_success=False, failure_msg=''):
         """Create a tag notification message.
@@ -13782,9 +13782,9 @@ class HostExports(object):
             maven_label = koji.mavenLabel(maven_info)
             ignore_archives = ignore_by_label.get(maven_label, {})
             build_id = maven_build_index.get(
-                        maven_info['group_id'], {}).get(
-                            maven_info['artifact_id'], {}).get(
-                                maven_info['version'])
+                maven_info['group_id'], {}).get(
+                maven_info['artifact_id'], {}).get(
+                maven_info['version'])
             if not build_id:
                 if not ignore_unknown:
                     # just warn for now. might be in ignore list. the loop below will check.
@@ -13814,7 +13814,7 @@ class HostExports(object):
                         if tag_archive:
                             logger.error("Size mismatch, br: %i, db: %i", fileinfo['size'], tag_archive['size'])
                         raise koji.BuildrootError('Unknown file in build environment: %s, size: %s' % \
-                              ('%s/%s' % (fileinfo['path'], fileinfo['filename']), fileinfo['size']))
+                                                  ('%s/%s' % (fileinfo['path'], fileinfo['filename']), fileinfo['size']))
 
         return br.updateArchiveList(archives, project)
 
@@ -13949,7 +13949,7 @@ class HostExports(object):
         build_dirs = {}
         rpmdata = {}
         rpm_check_keys = ['name', 'version', 'release', 'arch', 'epoch',
-                'size', 'payloadhash', 'build_id']
+                          'size', 'payloadhash', 'build_id']
         for bnp in kojipkgs:
             rpminfo = kojipkgs[bnp]
             rpm_id = rpminfo['id']
@@ -13958,8 +13958,8 @@ class HostExports(object):
             for key in rpm_check_keys:
                 if key not in rpminfo or rpminfo[key] != _rpminfo[key]:
                     raise koji.GenericError(
-                            'kojipkgs entry does not match db: file %s, key %s'
-                            % (bnp, key))
+                        'kojipkgs entry does not match db: file %s, key %s'
+                        % (bnp, key))
             if sigkey is None or sigkey == '':
                 relpath = koji.pathinfo.rpm(rpminfo)
             else:
@@ -14119,6 +14119,6 @@ def handle_upload(environ):
         ret['hexdigest'] = chksum.hexdigest()
     logger.debug("Upload result: %r", ret)
     logger.info("Completed upload for session %s (#%s): %f seconds, %i bytes, %s",
-                    context.session.id, context.session.callnum,
-                    time.time()-start, size, fn)
+                context.session.id, context.session.callnum,
+                time.time()-start, size, fn)
     return ret
diff --git a/hub/kojixmlrpc.py b/hub/kojixmlrpc.py
index 28ebee4f..dfbc24fe 100644
--- a/hub/kojixmlrpc.py
+++ b/hub/kojixmlrpc.py
@@ -292,8 +292,8 @@ class ModXMLRPCRequestHandler(object):
 
     def enforce_lockout(self):
         if context.opts.get('LockOut') and \
-            context.method not in ('login', 'krbLogin', 'sslLogin', 'logout') and \
-            not context.session.hasPerm('admin'):
+                context.method not in ('login', 'krbLogin', 'sslLogin', 'logout') and \
+                not context.session.hasPerm('admin'):
             raise koji.ServerOffline("Server disabled for maintenance")
 
     def _dispatch(self, method, params):
@@ -307,7 +307,7 @@ class ModXMLRPCRequestHandler(object):
 
         if self.logger.isEnabledFor(logging.INFO):
             self.logger.info("Handling method %s for session %s (#%s)",
-                            method, context.session.id, context.session.callnum)
+                             method, context.session.id, context.session.callnum)
             if method != 'uploadFile' and self.logger.isEnabledFor(logging.DEBUG):
                 self.logger.debug("Params: %s", pprint.pformat(params))
                 self.logger.debug("Opts: %s", pprint.pformat(opts))
@@ -318,9 +318,9 @@ class ModXMLRPCRequestHandler(object):
         if self.logger.isEnabledFor(logging.INFO):
             rusage = resource.getrusage(resource.RUSAGE_SELF)
             self.logger.info("Completed method %s for session %s (#%s): %f seconds, rss %s, stime %f",
-                            method, context.session.id, context.session.callnum,
-                            time.time()-start,
-                            rusage.ru_maxrss, rusage.ru_stime)
+                             method, context.session.id, context.session.callnum,
+                             time.time()-start,
+                             rusage.ru_maxrss, rusage.ru_stime)
 
         return ret
 
@@ -682,7 +682,7 @@ def server_setup(environ):
         opts = {
             'ServerOffline': True,
             'OfflineMessage': 'server startup error',
-            }
+        }
 
 
 #
@@ -762,7 +762,7 @@ def application(environ, start_response):
                     paramstr = paramstr[:117] + "..."
                 h.logger.warning("Memory usage of process %d grew from %d KiB to %d KiB (+%d KiB) processing request %s with args %s" % (os.getpid(), memory_usage_at_start, memory_usage_at_end, memory_usage_at_end - memory_usage_at_start, context.method, paramstr))
             h.logger.debug("Returning %d bytes after %f seconds", len(response),
-                        time.time() - start)
+                           time.time() - start)
         finally:
             # make sure context gets cleaned up
             if hasattr(context, 'cnx'):
diff --git a/koji/__init__.py b/koji/__init__.py
index 8c3a677f..b3f29ee1 100644
--- a/koji/__init__.py
+++ b/koji/__init__.py
@@ -115,7 +115,7 @@ RPM_FILEDIGESTALGO_IDS = {
     9:    'SHA384',
     10:   'SHA512',
     11:   'SHA224'
-    }
+}
 
 # rpm 4.12 introduces optional deps, but they can also be backported in some
 # rpm installations. So, we need to check their real support, not only rpm
@@ -678,7 +678,7 @@ class RawHeader(object):
                 elif pos < next:
                     print("** OVERLAPPING entries")
             print("Tag: %d [%s], Type: %d, Offset: %x, Count: %d" \
-                    % (tag, tags.get(tag, '?'), dtype, offset, count))
+                  % (tag, tags.get(tag, '?'), dtype, offset, count))
             if dtype == 0:
                 # null
                 print("[NULL entry]")
@@ -942,10 +942,10 @@ def get_header_field(hdr, name, src_arch=False):
         return []
 
     if (src_arch and name == "ARCH"
-                and get_header_field(hdr, "sourcepackage")):
+            and get_header_field(hdr, "sourcepackage")):
         # return "src" or "nosrc" arch instead of build arch for src packages
         if (get_header_field(hdr, "nosource")
-                    or get_header_field(hdr, "nopatch")):
+                or get_header_field(hdr, "nopatch")):
             return "nosrc"
         return "src"
 
@@ -1092,7 +1092,7 @@ def check_NVRA(nvra, strict=False):
 
 def _check_NVRA(nvra):
     if isinstance(nvra, six.string_types):
-            nvra = parse_NVRA(nvra)
+        nvra = parse_NVRA(nvra)
     if '-' in nvra['version']:
         raise GenericError('The "-" character not allowed in version field')
     if '-' in nvra['release']:
@@ -1281,13 +1281,13 @@ def make_groups_spec(grplist, name='buildsys-build', buildgroup=None):
     if buildgroup is None:
         buildgroup = name
     data = [
-"""#
+        """#
 # This specfile represents buildgroups for mock
 # Autogenerated by the build system
 #
 Summary: The base set of packages for a mock chroot\n""",
-"""Name: %s\n""" % name,
-"""Version: 1
+        """Name: %s\n""" % name,
+        """Version: 1
 Release: 1
 License: GPL
 Group: Development/Build Tools
@@ -1347,7 +1347,7 @@ def generate_comps(groups, expand_groups=False):
         else:
             return "false"
     data = [
-"""<?xml version="1.0"?>
+        """<?xml version="1.0"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
 
 <!-- Auto-generated by the build system -->
@@ -1364,7 +1364,7 @@ def generate_comps(groups, expand_groups=False):
         default = boolean_text(g['is_default'])
         uservisible = boolean_text(g['uservisible'])
         data.append(
-"""  <group>
+            """  <group>
     <id>%(group_id)s</id>
     <name>%(name)s</name>
     <description>%(description)s</description>
@@ -1373,13 +1373,13 @@ def generate_comps(groups, expand_groups=False):
 """ % locals())
         if g['biarchonly']:
             data.append(
-"""    <biarchonly>%s</biarchonly>
+                """    <biarchonly>%s</biarchonly>
 """ % boolean_text(True))
 
         # print grouplist, if any
         if g['grouplist'] and not expand_groups:
             data.append(
-"""    <grouplist>
+                """    <grouplist>
 """)
             grouplist = list(g['grouplist'])
             grouplist.sort(key=lambda x: x['name'])
@@ -1392,14 +1392,14 @@ def generate_comps(groups, expand_groups=False):
                     tag = "metapkg"
                 if thetype:
                     data.append(
-"""      <%(tag)s type="%(thetype)s">%(name)s</%(tag)s>
+                        """      <%(tag)s type="%(thetype)s">%(name)s</%(tag)s>
 """ % locals())
                 else:
                     data.append(
-"""      <%(tag)s>%(name)s</%(tag)s>
+                        """      <%(tag)s>%(name)s</%(tag)s>
 """ % locals())
             data.append(
-"""    </grouplist>
+                """    </grouplist>
 """)
 
         # print packagelist, if any
@@ -1414,14 +1414,14 @@ def generate_comps(groups, expand_groups=False):
             return "<packagereq %(opts)s>%(name)s</packagereq>" % locals()
 
         data.append(
-"""    <packagelist>
+            """    <packagelist>
 """)
         if g['packagelist']:
             packagelist = list(g['packagelist'])
             packagelist.sort(key=lambda x: x['package'])
             for p in packagelist:
                 data.append(
-"""      %s
+                    """      %s
 """ % package_entry(p))
             # also include expanded list, if needed
         if expand_groups and g['grouplist']:
@@ -1438,11 +1438,11 @@ def generate_comps(groups, expand_groups=False):
                 group = group_idx.get(group_name)
                 if group is None:
                     data.append(
-"""      <!-- MISSING GROUP: %s -->
+                        """      <!-- MISSING GROUP: %s -->
 """ % group_name)
                     continue
                 data.append(
-"""      <!-- Expanding Group: %s -->
+                    """      <!-- Expanding Group: %s -->
 """ % group_name)
                 pkglist = list(group['packagelist'])
                 pkglist.sort(key=lambda x: x['package'])
@@ -1451,7 +1451,7 @@ def generate_comps(groups, expand_groups=False):
                     if pkg_name in seen_pkg:
                         continue
                     data.append(
-"""      %s
+                        """      %s
 """ % package_entry(pkg))
                 for req in group['grouplist']:
                     req_name = req['name']
@@ -1459,13 +1459,13 @@ def generate_comps(groups, expand_groups=False):
                         continue
                     need.append(req_name)
         data.append(
-"""    </packagelist>
+            """    </packagelist>
 """)
         data.append(
-"""  </group>
+            """  </group>
 """)
     data.append(
-"""</comps>
+        """</comps>
 """)
     return ''.join(data)
 
@@ -1836,7 +1836,7 @@ def read_config(profile_name, user_config=None):
     cert_defaults = {
         'cert': '~/.koji/client.crt',
         'serverca': '~/.koji/serverca.crt',
-        }
+    }
     for name in cert_defaults:
         if result.get(name) is None:
             fn = os.path.expanduser(cert_defaults[name])
@@ -2100,7 +2100,7 @@ def is_requests_cert_error(e):
     if ('Permission denied' in errstr or  # certificate not readable
         'certificate revoked' in errstr or
         'certificate expired' in errstr or
-        'certificate verify failed' in errstr):
+            'certificate verify failed' in errstr):
         return True
 
     return False
@@ -2473,8 +2473,8 @@ class ClientSession(object):
             if principal:
                 if re.match(r'0[.][1-8]\b', requests_kerberos.__version__):
                     raise PythonImportError(
-                            'python-requests-kerberos >= 0.9.0 required for '
-                            'keytab auth'
+                        'python-requests-kerberos >= 0.9.0 required for '
+                        'keytab auth'
                     )
                 else:
                     kwargs['principal'] = principal
@@ -2869,7 +2869,7 @@ class ClientSession(object):
                 raise GenericError("server returned wrong chunk size: %s != %s" % (result['size'], len(chunk)))
             if result['hexdigest'] != hexdigest:
                 raise GenericError('upload checksum failed: %s != %s' \
-                        % (result['hexdigest'], hexdigest))
+                                   % (result['hexdigest'], hexdigest))
             ofs += len(chunk)
             now = time.time()
             t1 = max(now - lap, 0.00001)
@@ -2889,10 +2889,10 @@ class ClientSession(object):
             raise GenericError("File upload failed: %s/%s" % (path, name))
         if int(result['size']) != ofs:
             raise GenericError("Uploaded file is wrong length: %s/%s, %s != %s" \
-                    % (path, name, result['size'], ofs))
+                               % (path, name, result['size'], ofs))
         if problems and result['hexdigest'] != full_chksum.hexdigest():
             raise GenericError("Uploaded file has wrong checksum: %s/%s, %s != %s" \
-                    % (path, name, result['hexdigest'], full_chksum.hexdigest()))
+                               % (path, name, result['hexdigest'], full_chksum.hexdigest()))
         self.logger.debug("Fast upload: %s complete. %i bytes in %.1f seconds", localfile, size, t2)
 
     def _prepUpload(self, chunk, offset, path, name, verify="adler32", overwrite=False, volume=None):
@@ -3125,8 +3125,8 @@ class MultiCallSession(object):
         self._calls = []
         if batch:
             self._session.logger.debug(
-                    "MultiCall with batch size %i, calls/groups(%i/%i)",
-                    batch, len(calls), round(len(calls) // batch))
+                "MultiCall with batch size %i, calls/groups(%i/%i)",
+                batch, len(calls), round(len(calls) // batch))
             batches = [calls[i:i+batch] for i in range(0, len(calls), batch)]
         else:
             batches = [calls]
@@ -3390,7 +3390,7 @@ def _taskLabel(taskInfo):
             else:
                 kickstart = os.path.basename(stuff[7])
             extra = '%s, %s-%s-%s, %s, %s' % (stuff[4]['name'], stuff[0],
-                stuff[1], stuff[2], kickstart, stuff[3])
+                                              stuff[1], stuff[2], kickstart, stuff[3])
     elif method == 'restart':
         if 'request' in taskInfo:
             host = taskInfo['request'][0]
diff --git a/koji/arch.py b/koji/arch.py
index a36046fc..57969698 100644
--- a/koji/arch.py
+++ b/koji/arch.py
@@ -88,14 +88,14 @@ arches = {
 
     # itanium
     "ia64": "noarch",
-    }
+}
 
 #  Will contain information parsed from /proc/self/auxv via _parse_auxv().
 # Should move into rpm really.
 _aux_vector = {
     "platform": "",
     "hwcap": 0,
-    }
+}
 
 def legitMultiArchesInSameLib(arch=None):
     # this is completely crackrock - if anyone has a better way I
diff --git a/koji/auth.py b/koji/auth.py
index c2a0bdd5..8907ec79 100644
--- a/koji/auth.py
+++ b/koji/auth.py
@@ -110,7 +110,7 @@ class Session(object):
             'EXTRACT(EPOCH FROM start_time)': 'start_ts',
             'EXTRACT(EPOCH FROM update_time)': 'update_ts',
             'user_id': 'user_id',
-            }
+        }
         # sort for stability (unittests)
         fields, aliases = zip(*sorted(fields.items(), key=lambda x: x[1]))
         q = """
@@ -138,7 +138,7 @@ class Session(object):
             if lastcall is not None:
                 if lastcall > callnum:
                     raise koji.SequenceError("%d > %d (session %d)" \
-                            % (lastcall, callnum, id))
+                                             % (lastcall, callnum, id))
                 elif lastcall == callnum:
                     # Some explanation:
                     # This function is one of the few that performs its own commit.
@@ -339,7 +339,7 @@ class Session(object):
                 login_principal = proxyuser
             else:
                 raise koji.AuthError(
-                      'Kerberos principal %s is not authorized to log in other users' % cprinc.name)
+                    'Kerberos principal %s is not authorized to log in other users' % cprinc.name)
         else:
             login_principal = cprinc.name
 
@@ -538,7 +538,7 @@ class Session(object):
         # generate a random key
         alnum = string.ascii_letters + string.digits
         key = "%s-%s" %(user_id,
-                ''.join([random.choice(alnum) for x in range(1, 20)]))
+                        ''.join([random.choice(alnum) for x in range(1, 20)]))
         # use sha? sha.new(phrase).hexdigest()
 
         # get a session id
@@ -566,7 +566,7 @@ class Session(object):
         if master is None:
             master = self.id
         return self.createSession(self.user_id, self.hostip, self.authtype,
-                    master=master)
+                                  master=master)
 
     def getPerms(self):
         if not self.logged_in:
diff --git a/koji/daemon.py b/koji/daemon.py
index 684864c5..aa958e8b 100644
--- a/koji/daemon.py
+++ b/koji/daemon.py
@@ -200,7 +200,7 @@ class SCM(object):
         # otherwise not valid
         if strict:
             raise koji.GenericError('Invalid scheme in scm url. Valid schemes '
-                    'are: %s' % ' '.join(sorted(schemes)))
+                                    'are: %s' % ' '.join(sorted(schemes)))
         else:
             return False
 
@@ -410,7 +410,7 @@ class SCM(object):
                 if log_output(session, cmd[0], cmd, logfile, uploadpath,
                               cwd=chdir, logerror=1, append=append, env=env):
                     raise koji.BuildError('Error running %s command "%s", see %s for details' % \
-                        (self.scmtype, ' '.join(cmd), os.path.basename(logfile)))
+                                          (self.scmtype, ' '.join(cmd), os.path.basename(logfile)))
 
         if self.scmtype == 'CVS':
             pserver = ':pserver:%s@%s:%s' % ((self.user or 'anonymous'), self.host, self.repository)
@@ -945,7 +945,7 @@ class TaskManager(object):
         # return True if we should delay
         if now - ts < delay:
             self.logger.debug("skipping task %i, age=%s rank=%s"
-                                % (task['id'], int(now - ts), rank))
+                              % (task['id'], int(now - ts), rank))
             return True
         # otherwise
         del self.skipped_tasks[task['id']]
diff --git a/koji/plugin.py b/koji/plugin.py
index e8183de0..0735f9e2 100644
--- a/koji/plugin.py
+++ b/koji/plugin.py
@@ -56,7 +56,7 @@ callbacks = {
     'postCommit':             [],
     'preSCMCheckout':         [],
     'postSCMCheckout':        [],
-    }
+}
 
 class PluginTracker(object):
 
diff --git a/koji/policy.py b/koji/policy.py
index 27dbdf69..73e8c070 100644
--- a/koji/policy.py
+++ b/koji/policy.py
@@ -171,7 +171,7 @@ class CompareTest(BaseSimpleTest):
         '>=': lambda a, b: a >= b,
         '=': lambda a, b: a == b,
         '!=': lambda a, b: a != b,
-        }
+    }
 
     def __init__(self, str):
         """Read the test parameters from string"""
diff --git a/koji/tasks.py b/koji/tasks.py
index a86d0a69..80a1dda4 100644
--- a/koji/tasks.py
+++ b/koji/tasks.py
@@ -116,7 +116,7 @@ def parse_task_params(method, params):
 
     # check for new style
     if (len(params) == 1 and isinstance(params[0], dict)
-                and '__method__' in params[0]):
+            and '__method__' in params[0]):
         ret = params[0].copy()
         del ret['__method__']
         return ret
@@ -343,7 +343,7 @@ class BaseTaskHandler(object):
         # os.spawnvp(os.P_WAIT, 'rm', ['rm', '-rf', self.workdir])
 
     def wait(self, subtasks=None, all=False, failany=False, canfail=None,
-                timeout=None):
+             timeout=None):
         """Wait on subtasks
 
         subtasks is a list of integers (or an integer). If more than one subtask
@@ -417,7 +417,7 @@ class BaseTaskHandler(object):
                     self.logger.info('Subtasks timed out')
                     self.session.cancelTaskChildren(self.id)
                     raise koji.GenericError('Subtasks timed out after %.1f '
-                                'seconds' % duration)
+                                            'seconds' % duration)
             else:
                 # signal handler set by TaskManager.forkTask
                 self.logger.debug("Pausing...")
@@ -429,7 +429,7 @@ class BaseTaskHandler(object):
         if all:
             finished = subtasks
         return dict(self.session.host.taskWaitResults(self.id, finished,
-                                                    canfail=canfail))
+                                                      canfail=canfail))
 
 
     def getUploadDir(self):
diff --git a/koji/util.py b/koji/util.py
index 350c03fe..00c3c130 100644
--- a/koji/util.py
+++ b/koji/util.py
@@ -65,8 +65,8 @@ def formatChangelog(entries):
 %s
 
 """ % (_changelogDate(entry['date']),
-       koji._fix_print(entry['author']),
-       koji._fix_print(entry['text']))
+            koji._fix_print(entry['author']),
+            koji._fix_print(entry['text']))
     return result
 
 DATE_RE = re.compile(r'(\d+)-(\d+)-(\d+)')
@@ -92,7 +92,7 @@ def parseTime(val):
     if result:
         time = [int(r) for r in result.groups()]
     return calendar.timegm(
-            datetime.datetime(*(date + time)).timetuple())
+        datetime.datetime(*(date + time)).timetuple())
 
 
 def checkForBuilds(session, tag, builds, event, latest=False):
@@ -291,7 +291,7 @@ def apply_argspec(argspec, args, kwargs=None):
     for n, arg in enumerate(f_args):
         if arg not in data:
             raise koji.ParameterError('missing required argument %r (#%i)'
-                                        % (arg, n))
+                                      % (arg, n))
     return data
 
 
@@ -696,7 +696,7 @@ class MavenConfigOptAdapter(object):
     """
     MULTILINE = ['properties', 'envs']
     MULTIVALUE = ['goals', 'profiles', 'packages',
-                   'jvm_options', 'maven_options', 'buildrequires']
+                  'jvm_options', 'maven_options', 'buildrequires']
 
     def __init__(self, conf, section):
         self._conf = conf
diff --git a/koji/xmlrpcplus.py b/koji/xmlrpcplus.py
index 279d3abb..9cb9b9c9 100644
--- a/koji/xmlrpcplus.py
+++ b/koji/xmlrpcplus.py
@@ -100,7 +100,7 @@ def dumps(params, methodname=None, methodresponse=None, encoding=None,
             "<methodName>", methodname, "</methodName>\n",
             data,
             "</methodCall>\n"
-            )
+        )
     elif methodresponse:
         # a method response, or a fault structure
         parts = (
@@ -108,7 +108,7 @@ def dumps(params, methodname=None, methodresponse=None, encoding=None,
             "<methodResponse>\n",
             data,
             "</methodResponse>\n"
-            )
+        )
     else:
         return data  # return as is
     return ''.join(parts)
diff --git a/plugins/builder/runroot.py b/plugins/builder/runroot.py
index 40fb5364..22f0aa26 100644
--- a/plugins/builder/runroot.py
+++ b/plugins/builder/runroot.py
@@ -53,11 +53,11 @@ class RunRootTask(koji.tasks.BaseTaskHandler):
     def _read_config(self):
         cp = koji.read_config_files(CONFIG_FILE)
         self.config = {
-           'default_mounts': [],
-           'safe_roots': [],
-           'path_subs': [],
-           'paths': [],
-           'internal_dev_setup': None,
+            'default_mounts': [],
+            'safe_roots': [],
+            'path_subs': [],
+            'paths': [],
+            'internal_dev_setup': None,
         }
 
         # main options
@@ -155,12 +155,12 @@ class RunRootTask(koji.tasks.BaseTaskHandler):
         if not repo_info:
             # wait for it
             task_id = self.session.host.subtask(method='waitrepo',
-                                           arglist=[root, None, None],
-                                           parent=self.id)
+                                                arglist=[root, None, None],
+                                                parent=self.id)
             repo_info = self.wait(task_id)[task_id]
         broot = BuildRoot(self.session, self.options, root, br_arch, self.id,
-                repo_id=repo_info['id'], setup_dns=True,
-                internal_dev_setup=self.config['internal_dev_setup'])
+                          repo_id=repo_info['id'], setup_dns=True,
+                          internal_dev_setup=self.config['internal_dev_setup'])
         broot.workdir = self.workdir
         broot.init()
         rootdir = broot.rootdir()
@@ -282,7 +282,7 @@ class RunRootTask(koji.tasks.BaseTaskHandler):
                 status = log_output(self.session, cmd[0], cmd, logfile, uploadpath, logerror=True, append=True)
                 if not isSuccess(status):
                     error = koji.GenericError("Unable to mount %s: %s" \
-                            % (mpoint, parseStatus(status, cmd)))
+                                              % (mpoint, parseStatus(status, cmd)))
                     break
                 fslog.write("%s\n" % mpoint)
                 fslog.flush()
diff --git a/plugins/cli/runroot.py b/plugins/cli/runroot.py
index e1258a77..95ff6055 100644
--- a/plugins/cli/runroot.py
+++ b/plugins/cli/runroot.py
@@ -25,20 +25,20 @@ def handle_runroot(options, session, args):
     parser.add_option("-p", "--package", action="append", default=[], help=_("make sure this package is in the chroot"))
     parser.add_option("-m", "--mount", action="append", default=[], help=_("mount this directory read-write in the chroot"))
     parser.add_option("--skip-setarch", action="store_true", default=False,
-            help=_("bypass normal setarch in the chroot"))
+                      help=_("bypass normal setarch in the chroot"))
     parser.add_option("-w", "--weight", type='int', help=_("set task weight"))
     parser.add_option("--channel-override", help=_("use a non-standard channel"))
     parser.add_option("--task-id", action="store_true", default=False,
-            help=_("Print the ID of the runroot task"))
+                      help=_("Print the ID of the runroot task"))
     parser.add_option("--use-shell", action="store_true", default=False,
-            help=_("Run command through a shell, otherwise uses exec"))
+                      help=_("Run command through a shell, otherwise uses exec"))
     parser.add_option("--new-chroot", action="store_true", default=None,
-            help=_("Run command with the --new-chroot (systemd-nspawn) option to mock"))
+                      help=_("Run command with the --new-chroot (systemd-nspawn) option to mock"))
     parser.add_option("--old-chroot", action="store_false", default=None, dest='new_chroot',
-            help=_("Run command with the --old-chroot (systemd-nspawn) option to mock"))
+                      help=_("Run command with the --old-chroot (systemd-nspawn) option to mock"))
     parser.add_option("--repo-id", type="int", help=_("ID of the repo to use"))
     parser.add_option("--nowait", action="store_false", dest="wait",
-            default=True, help=_("Do not wait on task"))
+                      default=True, help=_("Do not wait on task"))
     parser.add_option("--watch", action="store_true", help=_("Watch task instead of printing runroot.log"))
     parser.add_option("--quiet", action="store_true", default=options.quiet,
                       help=_("Do not print the task information"))
diff --git a/plugins/cli/save_failed_tree.py b/plugins/cli/save_failed_tree.py
index 6a0cb00f..7bfee70d 100644
--- a/plugins/cli/save_failed_tree.py
+++ b/plugins/cli/save_failed_tree.py
@@ -14,13 +14,13 @@ def handle_save_failed_tree(options, session, args):
     usage += _("\n(Specify the --help global option for a list of other help options)")
     parser = OptionParser(usage=usage)
     parser.add_option("-f", "--full", action="store_true", default=False,
-            help=_("Download whole tree, if not specified, only builddir will be downloaded"))
+                      help=_("Download whole tree, if not specified, only builddir will be downloaded"))
     parser.add_option("-t", "--task", action="store_const", dest="mode",
-            const="task", default="task",
-            help=_("Treat ID as a task ID (the default)"))
+                      const="task", default="task",
+                      help=_("Treat ID as a task ID (the default)"))
     parser.add_option("-r", "--buildroot", action="store_const", dest="mode",
-            const="buildroot",
-            help=_("Treat ID as a buildroot ID"))
+                      const="buildroot",
+                      help=_("Treat ID as a buildroot ID"))
     parser.add_option("--quiet", action="store_true", default=options.quiet,
                       help=_("Do not print the task information"))
     parser.add_option("--nowait", action="store_true",
@@ -63,7 +63,7 @@ def handle_save_failed_tree(options, session, args):
     if not opts.quiet:
         print(_("Created task %s for buildroot %s") % (task_id, br_id))
         print("Task info: %s/taskinfo?taskID=%s"
-                % (options.weburl, task_id))
+              % (options.weburl, task_id))
 
     if opts.nowait:
         return
diff --git a/plugins/hub/rpm2maven.py b/plugins/hub/rpm2maven.py
index bbf75816..b677740d 100644
--- a/plugins/hub/rpm2maven.py
+++ b/plugins/hub/rpm2maven.py
@@ -66,8 +66,8 @@ def expand_rpm(filepath, tmpdir):
                             close_fds=True)
     if rpm2cpio.wait() != 0 or cpio.wait() != 0:
         raise koji.CallbackError('error extracting files from %s, ' \
-              'rpm2cpio returned %s, cpio returned %s' % \
-              (filepath, rpm2cpio.wait(), cpio.wait()))
+                                 'rpm2cpio returned %s, cpio returned %s' % \
+                                 (filepath, rpm2cpio.wait(), cpio.wait()))
     devnull.close()
 
 
diff --git a/plugins/hub/runroot_hub.py b/plugins/hub/runroot_hub.py
index 8dfda89e..a2b52698 100644
--- a/plugins/hub/runroot_hub.py
+++ b/plugins/hub/runroot_hub.py
@@ -56,7 +56,7 @@ def runroot(tagInfo, arch, command, channel=None, **opts):
             choices = [x for x in tagarches if x in chanarches]
             if not choices:
                 raise koji.GenericError('no common arches for tag/channel: %s/%s' \
-                            % (tagInfo, taskopts['channel']))
+                                        % (tagInfo, taskopts['channel']))
             taskopts['arch'] = koji.canonArch(random.choice(choices))
 
     args = koji.encode_args(tagInfo, arch, command, **opts)
diff --git a/plugins/hub/save_failed_tree.py b/plugins/hub/save_failed_tree.py
index 793fefb0..59881a36 100644
--- a/plugins/hub/save_failed_tree.py
+++ b/plugins/hub/save_failed_tree.py
@@ -43,7 +43,7 @@ def saveFailedTree(buildrootID, full=False, **opts):
         raise koji.PreBuildError("Task %s has not failed. Only failed tasks can upload their buildroots." % taskID)
     elif allowed_methods != '*' and task_info['method'] not in allowed_methods:
         raise koji.PreBuildError("Only %s tasks can upload their buildroots (Task %s is %s)." % \
-               (', '.join(allowed_methods), task_info['id'], task_info['method']))
+                                 (', '.join(allowed_methods), task_info['id'], task_info['method']))
     elif task_info["owner"] != context.session.user_id and not context.session.hasPerm('admin'):
         raise koji.ActionNotAllowed("Only owner of failed task or 'admin' can run this task.")
     elif not kojihub.get_host(task_info['host_id'])['enabled']:
diff --git a/util/koji-gc b/util/koji-gc
index 48f1dd70..ddd05b02 100755
--- a/util/koji-gc
+++ b/util/koji-gc
@@ -139,7 +139,7 @@ def get_options():
         ['krbservice', None, 'string'],
         ['krb_rdns', None, 'boolean'],
         ['krb_canon_host', None, 'boolean'],
-            ['krb_server_realm', None, 'string'],
+        ['krb_server_realm', None, 'string'],
         ['runas', None, 'string'],
         ['user', None, 'string'],
         ['password', None, 'string'],
@@ -150,8 +150,8 @@ def get_options():
         ['server', None, 'string'],
         ['weburl', None, 'string'],
         ['smtp_host', None, 'string'],
-            ['smtp_user', None, 'string'],
-            ['smtp_pass', None, 'string'],
+        ['smtp_user', None, 'string'],
+        ['smtp_pass', None, 'string'],
         ['from_addr', None, 'string'],
         ['email_template', None, 'string'],
         ['email_domain', None, 'string'],
@@ -162,9 +162,9 @@ def get_options():
         ['trashcan_tag', None, 'string'],
         ['no_ssl_verify', None, 'boolean'],
         ['timeout', None, 'integer'],
-            ['lock_file', None, 'string'],
-            ['exit_on_lock', None, 'boolean'],
-        ]
+        ['lock_file', None, 'string'],
+        ['exit_on_lock', None, 'boolean'],
+    ]
     for name, alias, type in cfgmap:
         if alias is None:
             alias = ('main', name)
@@ -903,7 +903,7 @@ def handle_prune():
                     'order': order - skipped,
                     'ts' : entry['create_ts'],
                     'nvr' : nvr,
-                    }
+                }
                 data = LazyDict(data)
                 data['keys'] = LazyValue(get_build_sigs, (entry['build_id'],), {'cache':True})
                 data['volname'] = LazyValue(lambda x: session.getBuild(x).get('volume_name'),
diff --git a/util/koji-shadow b/util/koji-shadow
index 183c6910..ebf5a7e5 100755
--- a/util/koji-shadow
+++ b/util/koji-shadow
@@ -82,7 +82,7 @@ def get_options():
     parser.add_option("--krbservice", help=_("the service name of the"
                                              " principal being used by the hub"))
     parser.add_option("--runas", metavar="USER",
-             help=_("run as the specified user (requires special privileges)"))
+                      help=_("run as the specified user (requires special privileges)"))
     parser.add_option("--user", help=_("specify user"))
     parser.add_option("--password", help=_("specify password"))
     parser.add_option("--krb-rdns", action="store_true", default=False,
@@ -316,7 +316,7 @@ def _unique_path(prefix):
     # For some reason repr(time.time()) includes 4 or 5
     # more digits of precision than str(time.time())
     return '%s/%r.%s' % (prefix, time.time(),
-                      ''.join([random.choice(string.ascii_letters) for i in range(8)]))
+                         ''.join([random.choice(string.ascii_letters) for i in range(8)]))
 
 
 class LocalBuild(object):
@@ -547,7 +547,7 @@ class BuildTracker(object):
         self.state_idx = {}
         self.nvr_idx = {}
         for state in ('common', 'pending', 'missing', 'broken', 'brokendeps',
-                     'noroot', 'blocked', 'grey'):
+                      'noroot', 'blocked', 'grey'):
             self.state_idx.setdefault(state, {})
         self.scanRules()
 
@@ -1164,7 +1164,7 @@ class BuildTracker(object):
                 ret = True
                 if build.state != 'common':
                     log ("Task %i finished, but %s still missing" \
-                            % (build.task_id, build.nvr))
+                         % (build.task_id, build.nvr))
         return ret
 
     def checkBuildDeps(self, build):
@@ -1173,14 +1173,14 @@ class BuildTracker(object):
             # log("No revised deplist yet for %s" % build.nvr)
             return False
         problem = [x for x in build.revised_deps
-                         if x.state in ('broken', 'brokendeps', 'noroot', 'blocked')]
+                   if x.state in ('broken', 'brokendeps', 'noroot', 'blocked')]
         if problem:
             log ("Can't rebuild %s, missing %i deps" % (build.nvr, len(problem)))
             build.setState('brokendeps')
             self._print_builds(problem)
             return False
         not_common = [x for x in build.revised_deps
-                         if x.state not in ('common', 'local')]
+                      if x.state not in ('common', 'local')]
         if not_common:
             # could be missing or still building or whatever
             # log("Still missing %i revised deps for %s" % (len(not_common), build.nvr))
diff --git a/util/kojira b/util/kojira
index fdf492b1..3fd4aceb 100755
--- a/util/kojira
+++ b/util/kojira
@@ -348,11 +348,11 @@ class RepoManager(object):
                 # we're already tracking it
                 if repo.state != data['state']:
                     self.logger.info('State changed for repo %s: %s -> %s'
-                                       %(repo_id, koji.REPO_STATES[repo.state], koji.REPO_STATES[data['state']]))
+                                     %(repo_id, koji.REPO_STATES[repo.state], koji.REPO_STATES[data['state']]))
                     repo.state = data['state']
             else:
                 self.logger.info('Found repo %s, state=%s'
-                                   %(repo_id, koji.REPO_STATES[data['state']]))
+                                 %(repo_id, koji.REPO_STATES[data['state']]))
                 repo = ManagedRepo(self, data)
                 self.repos[repo_id] = repo
             if not getTag(self.session, repo.tag_id) and not repo.expired():
@@ -488,7 +488,7 @@ class RepoManager(object):
                     if not self.options.ignore_stray_repos:
                         age = time.time() - dir_ts
                         self.logger.debug("did not expect %s; age: %s",
-                                repodir, age)
+                                          repodir, age)
                         if age > max_age:
                             self.logger.info("Removing unexpected directory (no such repo): %s", repodir)
                             if symlink:
@@ -545,7 +545,7 @@ class RepoManager(object):
         stats = self.tagUseStats(entry['taginfo']['id'])
         # normalize use count
         max_n = max([t.get('n_recent', 0) for t in self.needed_tags.values()]
-                        or [1])
+                    or [1])
         if max_n == 0:
             # no recent use or missing data
             max_n = 1
@@ -559,7 +559,7 @@ class RepoManager(object):
             age = 0
         entry['score'] = age * adj
         self.logger.debug("Needed tag %s got score %.2f",
-                    entry['taginfo']['name'], entry['score'])
+                          entry['taginfo']['name'], entry['score'])
         # so a day old unused repo gets about the regen same score as a
         # 2.4-hour-old, very popular repo
 
@@ -572,7 +572,7 @@ class RepoManager(object):
         self.logger.debug("Current tasks: %r" % self.tasks)
         if self.other_tasks:
             self.logger.debug("Found %i untracked newRepo tasks",
-                        len(self.other_tasks))
+                              len(self.other_tasks))
         self.logger.debug("Updating repos")
 
         self.readCurrentRepos()
@@ -634,7 +634,7 @@ class RepoManager(object):
 
         # also check other newRepo tasks
         repo_tasks = self.session.listTasks(opts={'method':'newRepo',
-                            'state':([koji.TASK_STATES[s] for s in ('FREE', 'OPEN')])})
+                                                  'state':([koji.TASK_STATES[s] for s in ('FREE', 'OPEN')])})
         others = [t for t in repo_tasks if t['id'] not in self.tasks]
         for tinfo in others:
             if tinfo['id'] not in self.other_tasks:
@@ -651,7 +651,7 @@ class RepoManager(object):
         self.build_tags = set([
             t['build_tag'] for t in self.session.getBuildTargets()
             if not koji.util.multi_fnmatch(t['build_tag_name'], ignore)
-            ])
+        ])
         # index repos by tag
         tag_repos = {}
         for repo in to_list(self.repos.values()):
@@ -672,7 +672,7 @@ class RepoManager(object):
                 if covered:
                     # no longer needed
                     self.logger.info("Tag %(name)s has a current or in "
-                            "progress repo", entry['taginfo'])
+                                     "progress repo", entry['taginfo'])
                     del self.needed_tags[tag_id]
                 # if not covered, we already know
                 continue
@@ -699,10 +699,10 @@ class RepoManager(object):
                 ts = time.time()
 
             entry = {
-                    'taginfo': taginfo,
-                    'expire_ts': ts,
-                    'needed_since' : time.time(),
-                    }
+                'taginfo': taginfo,
+                'expire_ts': ts,
+                'needed_since' : time.time(),
+            }
             self.setTagScore(entry)
             self.needed_tags[tag_id] = entry
 
@@ -711,7 +711,7 @@ class RepoManager(object):
             entry = self.needed_tags.get(tag_id)
             if tag_id not in self.build_tags:
                 self.logger.info("Tag %(name)s is no longer a build tag",
-                        entry['taginfo'])
+                                 entry['taginfo'])
                 del self.needed_tags[tag_id]
         for tag_id, repolist in tag_repos.items():
             if tag_id not in self.build_tags:
@@ -750,7 +750,7 @@ class RepoManager(object):
                 self.logger.info("Maximum number of repo tasks reached")
                 return
             elif (len(self.tasks) + len(self.other_tasks)
-                            >= self.options.repo_tasks_limit):
+                  >= self.options.repo_tasks_limit):
                 self.logger.info("Repo task limit reached")
                 return
             tagname = tag['taginfo']['name']
@@ -765,7 +765,7 @@ class RepoManager(object):
                 else:
                     # should not happen
                     logger.warning('Needed tag refers to unknown task. '
-                            '%s -> %i', tagname, task_id)
+                                   '%s -> %i', tagname, task_id)
                     # we'll advance and create a new task
             taskopts = {}
             if koji.util.multi_fnmatch(tagname, debuginfo_pat):
@@ -788,14 +788,14 @@ class RepoManager(object):
             else:
                 time_expired = "%.1f" % (time.time() - expire_ts)
             self.logger.info("Created newRepo task %s for tag %s (%s), "
-                    "expired for %s sec", task_id, tag['taginfo']['id'],
-                    tag['taginfo']['name'], time_expired)
+                             "expired for %s sec", task_id, tag['taginfo']['id'],
+                             tag['taginfo']['name'], time_expired)
             self.tasks[task_id] = {
-                    'id': task_id,
-                    'taskinfo': self.session.getTaskInfo(task_id),
-                    'tag_id': tag['taginfo']['id'],
-                    'maven': maven,
-                    }
+                'id': task_id,
+                'taskinfo': self.session.getTaskInfo(task_id),
+                'tag_id': tag['taginfo']['id'],
+                'maven': maven,
+            }
             tag['task_id'] = task_id
         if running_tasks_maven >= self.options.max_repo_tasks_maven:
             self.logger.info("Maximum number of maven repo tasks reached")
@@ -804,7 +804,7 @@ class RepoManager(object):
 def start_currency_checker(session, repomgr):
     subsession = session.subsession()
     thread = threading.Thread(name='currencyChecker',
-                        target=repomgr.currencyChecker, args=(subsession,))
+                              target=repomgr.currencyChecker, args=(subsession,))
     thread.setDaemon(True)
     thread.start()
     return thread
@@ -813,7 +813,7 @@ def start_currency_checker(session, repomgr):
 def start_regen_loop(session, repomgr):
     subsession = session.subsession()
     thread = threading.Thread(name='regenLoop',
-                        target=repomgr.regenLoop, args=(subsession,))
+                              target=repomgr.regenLoop, args=(subsession,))
     thread.setDaemon(True)
     thread.start()
     return thread
diff --git a/vm/kojikamid.py b/vm/kojikamid.py
index 0911a1a9..d5d88fc4 100755
--- a/vm/kojikamid.py
+++ b/vm/kojikamid.py
@@ -617,7 +617,7 @@ def get_mgmt_server():
     logger.debug('found MAC address %s, connecting to %s:%s',
                  macaddr, gateway, MANAGER_PORT)
     server = six.moves.xmlrpc_client.ServerProxy('http://%s:%s/' %
-                                   (gateway, MANAGER_PORT), allow_none=True)
+                                                 (gateway, MANAGER_PORT), allow_none=True)
     # we would set a timeout on the socket here, but that is apparently not
     # supported by python/cygwin/Windows
     task_port = server.getPort(macaddr)
diff --git a/vm/kojivmd b/vm/kojivmd
index 35648569..64d0ff4c 100755
--- a/vm/kojivmd
+++ b/vm/kojivmd
@@ -98,7 +98,7 @@ def get_options():
     parser.add_option("--maxjobs", type='int', help="Specify maxjobs")
     parser.add_option("--sleeptime", type='int', help="Specify the polling interval")
     parser.add_option("--admin-emails", type='str', action="store", metavar="EMAILS",
-                       help="Comma-separated addresses to send error notices to.")
+                      help="Comma-separated addresses to send error notices to.")
     parser.add_option("--workdir", help="Specify workdir")
     parser.add_option("--pluginpath", help="Specify plugin search path")
     parser.add_option("--plugin", action="append", help="Load specified plugin")
@@ -266,7 +266,7 @@ class DaemonXMLRPCServer(six.moves.xmlrpc_server.SimpleXMLRPCServer):
             six.moves.xmlrpc_server.SimpleXMLRPCServer.__init__(self, (addr, port), logRequests=False)
         else:
             six.moves.xmlrpc_server.SimpleXMLRPCServer.__init__(self, (addr, port), logRequests=False,
-                                                           allow_none=True)
+                                                                allow_none=True)
         self.logger = logging.getLogger('koji.vm.DaemonXMLRPCServer')
         self.socket.settimeout(5)
         self.active = True
@@ -308,7 +308,7 @@ class DaemonXMLRPCServer(six.moves.xmlrpc_server.SimpleXMLRPCServer):
                 # report exception back to server
                 response = six.moves.xmlrpc_client.dumps(
                     six.moves.xmlrpc_client.Fault(1, "%s:%s" % (sys.exc_type, sys.exc_value))
-                    )
+                )
             return response
 
 
@@ -350,7 +350,7 @@ class WinBuildTask(MultiPlatformTask):
                 'build_tag' : build_tag['id'],
                 'skip_tag' : bool(opts.get('skip_tag')),
                 'target': target_info['id']
-                }
+            }
             if not opts.get('skip_tag'):
                 policy_data['tag'] = dest_tag['id']
             self.session.host.assertPolicy('build_from_repo_id', policy_data)
@@ -378,10 +378,10 @@ class WinBuildTask(MultiPlatformTask):
                 # Make sure package is on the list for this tag
                 if pkg_cfg is None:
                     raise koji.BuildError("package %s not in list for tag %s" \
-                            % (build_info['name'], dest_tag['name']))
+                                          % (build_info['name'], dest_tag['name']))
                 elif pkg_cfg['blocked']:
                     raise koji.BuildError("package %s is blocked for tag %s" \
-                            % (build_info['name'], dest_tag['name']))
+                                          % (build_info['name'], dest_tag['name']))
 
             build_info = self.session.host.initWinBuild(self.id, build_info,
                                                         koji.util.dslice(results, ['platform']))
@@ -430,7 +430,7 @@ class VMExecTask(BaseTaskHandler):
     def __init__(self, *args, **kw):
         super(VMExecTask, self).__init__(*args, **kw)
         self.task_manager = six.moves.xmlrpc_client.ServerProxy('http://%s:%s/' % (self.options.privaddr, self.options.portbase),
-                                                  allow_none=True)
+                                                                allow_none=True)
         self.port = None
         self.server = None
         self.task_info = None
@@ -450,7 +450,7 @@ class VMExecTask(BaseTaskHandler):
         ret = proc.wait()
         if ret:
             raise koji.BuildError('unable to create qcow2 image, "%s" returned %s; output was: %s' % \
-                  (' '.join(cmd), ret, output))
+                                  (' '.join(cmd), ret, output))
         vm_user = pwd.getpwnam(self.options.vmuser)
         os.chown(new_path, vm_user.pw_uid, vm_user.pw_gid)
         return new_path
@@ -680,13 +680,13 @@ class VMExecTask(BaseTaskHandler):
             remote_pi = koji.PathInfo(self.options.topurl)
             if type == 'rpm':
                 remote_url = remote_pi.build(buildinfo) + '/' + \
-                             fileinfo['localpath']
+                    fileinfo['localpath']
             elif type == 'maven':
                 remote_url = remote_pi.mavenbuild(buildinfo) + '/' + \
-                             fileinfo['localpath']
+                    fileinfo['localpath']
             elif type == 'win':
                 remote_url = remote_pi.winbuild(buildinfo) + '/' + \
-                             fileinfo['localpath']
+                    fileinfo['localpath']
             else:
                 raise koji.BuildError('unsupported file type: %s' % type)
             koji.ensuredir(os.path.dirname(localpath))
@@ -706,7 +706,7 @@ class VMExecTask(BaseTaskHandler):
                         fileinfo['payloadhash'], payloadhash))
                 if not koji.util.check_sigmd5(localpath):
                     raise koji.BuildError("Downloaded rpm %s doesn't match sigmd5" % \
-                        os.path.basename(fileinfo['localpath']))
+                                          os.path.basename(fileinfo['localpath']))
             else:
                 self.verifyChecksum(localpath, fileinfo['checksum'], koji.CHECKSUM_TYPES[fileinfo['checksum_type']])
 
@@ -746,7 +746,7 @@ class VMExecTask(BaseTaskHandler):
             size = os.path.getsize(local_path)
             if offset != size:
                 raise koji.BuildError('cannot write to %s at offset %s, size is %s' % \
-                      (local_path, offset, size))
+                                      (local_path, offset, size))
             fobj = open(local_path, 'r+')
             fobj.seek(offset)
         data = base64.b64decode(contents)
@@ -790,7 +790,7 @@ class VMExecTask(BaseTaskHandler):
             return True
         else:
             raise koji.BuildError('%s checksum validation failed for %s, %s (computed) != %s (provided)' % \
-                  (algo, local_path, sum.hexdigest(), checksum))
+                                  (algo, local_path, sum.hexdigest(), checksum))
 
     def closeTask(self, output):
         self.output = output
@@ -855,7 +855,7 @@ class VMExecTask(BaseTaskHandler):
         except libvirt.libvirtError as e:
             self.logger.error('error starting VM %s', clone_name, exc_info=True)
             raise koji.PreBuildError('error starting VM %s, error was: %s' % \
-                  (clone_name, e))
+                                     (clone_name, e))
 
         start = time.time()
         while True:
@@ -873,7 +873,7 @@ class VMExecTask(BaseTaskHandler):
                     vm.destroy()
                     self.server.server_close()
                     raise koji.BuildError('Task did not complete after %.2f minutes, VM %s has been destroyed' % \
-                          (mins, clone_name))
+                                          (mins, clone_name))
             else:
                 vm.destroy()
                 self.server.server_close()
@@ -941,7 +941,7 @@ class VMTaskManager(TaskManager):
         for node in nodelist:
             disk = node.prop('file')
             if os.path.basename(disk).startswith(VMExecTask.CLONE_PREFIX) and \
-                   disk.endswith(VMExecTask.QCOW2_EXT):
+                    disk.endswith(VMExecTask.QCOW2_EXT):
                 disks.append(disk)
         ctx.xpathFreeContext()
         doc.freeDoc()
diff --git a/www/kojiweb/index.py b/www/kojiweb/index.py
index 19414bf0..d68e10c1 100644
--- a/www/kojiweb/index.py
+++ b/www/kojiweb/index.py
@@ -191,7 +191,7 @@ def _construct_url(environ, page):
     host = environ['SERVER_NAME']
     url_scheme = environ['wsgi.url_scheme']
     if (url_scheme == 'https' and port == '443') or \
-        (url_scheme == 'http' and port == '80'):
+            (url_scheme == 'http' and port == '80'):
         return "%s://%s%s" % (url_scheme, host, page)
     return "%s://%s:%s%s" % (url_scheme, host, port, page)
 
@@ -683,7 +683,7 @@ def taskinfo(environ, taskID):
             values['excClass'] = None
             if task['method'] == 'buildContainer' and 'koji_builds' in result:
                 values['taskBuilds'] = [
-                        server.getBuild(int(buildID)) for buildID in result['koji_builds']]
+                    server.getBuild(int(buildID)) for buildID in result['koji_builds']]
     else:
         values['result'] = None
         values['excClass'] = None
@@ -819,7 +819,7 @@ def tags(environ, start=None, order=None, childID=None):
     values['order'] = order
 
     kojiweb.util.paginateMethod(server, values, 'listTags', kw=None,
-                                 start=start, dataName='tags', prefix='tag', order=order)
+                                start=start, dataName='tags', prefix='tag', order=order)
 
     if environ['koji.currentUser']:
         values['perms'] = server.getUserPerms(environ['koji.currentUser']['id'])
@@ -859,8 +859,8 @@ def packages(environ, tagID=None, userID=None, order='package_name', start=None,
     values['inherited'] = inherited
 
     kojiweb.util.paginateMethod(server, values, 'listPackages',
-                                    kw={'tagID': tagID, 'userID': userID, 'prefix': prefix, 'inherited': bool(inherited)},
-                                    start=start, dataName='packages', prefix='package', order=order)
+                                kw={'tagID': tagID, 'userID': userID, 'prefix': prefix, 'inherited': bool(inherited)},
+                                start=start, dataName='packages', prefix='package', order=order)
 
     values['chars'] = _PREFIX_CHARS
 
@@ -1652,8 +1652,8 @@ def channelinfo(environ, channelID):
 
     states = [koji.TASK_STATES[s] for s in ('FREE', 'OPEN', 'ASSIGNED')]
     values['taskCount'] = \
-            server.listTasks(opts={'channel_id': channelID, 'state': states},
-                             queryOpts={'countOnly': True})
+        server.listTasks(opts={'channel_id': channelID, 'state': states},
+                         queryOpts={'countOnly': True})
 
     hosts = server.listHosts(channelID=channelID)
     hosts.sort(key=_sortbyname)
@@ -1756,7 +1756,7 @@ def archivelist(environ, type, buildrootID=None, imageID=None, start=None, order
                                         start=start, dataName='archives', prefix='archive', order=order)
         elif type == 'built':
             kojiweb.util.paginateMethod(server, values, 'listArchives', kw={'buildrootID': buildroot['id']},
-                                    start=start, dataName='archives', prefix='archive', order=order)
+                                        start=start, dataName='archives', prefix='archive', order=order)
         else:
             raise koji.GenericError('unrecognized type of archivelist')
     elif imageID is not None:
diff --git a/www/lib/kojiweb/util.py b/www/lib/kojiweb/util.py
index f7709d8a..9920269a 100644
--- a/www/lib/kojiweb/util.py
+++ b/www/lib/kojiweb/util.py
@@ -551,8 +551,8 @@ def escapeHTML(value):
 
     value = koji.fixEncoding(value)
     return value.replace('&', '&amp;').\
-           replace('<', '&lt;').\
-           replace('>', '&gt;')
+        replace('<', '&lt;').\
+        replace('>', '&gt;')
 
 def authToken(template, first=False, form=False):
     """Return the current authToken if it exists.
@@ -644,7 +644,7 @@ class TaskResultFragment(object):
         - empty_str_placeholder
     """
     def __init__(self, text='', size=None, need_escape=None, begin_tag='',
-                     end_tag='', composer=None, empty_str_placeholder=None):
+                 end_tag='', composer=None, empty_str_placeholder=None):
         self.text = text
         if size is None:
             self.size = len(text)
@@ -689,7 +689,7 @@ class TaskResultLine(object):
         - composer
     """
     def __init__(self, fragments=None, need_escape=None, begin_tag='',
-                     end_tag='<br />', composer=None):
+                 end_tag='<br />', composer=None):
         if fragments is None:
             self.fragments = []
         else:
@@ -746,18 +746,18 @@ def _parse_value(key, value, sep=', '):
         _str = sep.join([str(val) for val in value])
     elif isinstance(value, dict):
         _str = sep.join(['%s=%s' % ((n == '' and "''" or n), v)
-                             for n, v in value.items()])
+                         for n, v in value.items()])
     else:
         _str = str(value)
     if _str is None:
         _str = ''
 
     return TaskResultFragment(text=_str, need_escape=need_escape,
-                                  begin_tag=begin_tag, end_tag=end_tag)
+                              begin_tag=begin_tag, end_tag=end_tag)
 
 def task_result_to_html(result=None, exc_class=None,
-                            max_abbr_lines=None, max_abbr_len=None,
-                            abbr_postscript=None):
+                        max_abbr_lines=None, max_abbr_len=None,
+                        abbr_postscript=None):
     """convert the result to a mutiple lines HTML fragment
 
     Args:
@@ -801,7 +801,7 @@ def task_result_to_html(result=None, exc_class=None,
 
     def _parse_properties(props):
         return ', '.join([v is not None and '%s=%s' % (n, v) or str(n)
-                              for n, v in props.items()])
+                          for n, v in props.items()])
 
     if exc_class:
         if hasattr(result, 'faultString'):
@@ -810,7 +810,7 @@ def task_result_to_html(result=None, exc_class=None,
             _str = "%s: %s" % (exc_class.__name__, str(result))
         fragment = TaskResultFragment(text=_str, need_escape=True)
         line = TaskResultLine(fragments=[fragment],
-                                  begin_tag='<pre>', end_tag='</pre>')
+                              begin_tag='<pre>', end_tag='</pre>')
         lines.append(line)
     elif isinstance(result, dict):
 
@@ -821,8 +821,8 @@ def task_result_to_html(result=None, exc_class=None,
             val_fragment = line.fragments[1]
             if length is None:
                 return '%s%s = %s%s%s' % (line.begin_tag, key_fragment.composer(),
-                                            val_fragment.composer(), postscript,
-                                            line.end_tag)
+                                          val_fragment.composer(), postscript,
+                                          line.end_tag)
             first_part_len = len('%s = ') + key_fragment.size
             remainder_len = length - first_part_len
             if remainder_len < 0: remainder_len = 0
@@ -840,7 +840,7 @@ def task_result_to_html(result=None, exc_class=None,
                 val_fragment = _parse_value(k, v)
                 key_fragment = TaskResultFragment(text=k, need_escape=True)
                 line = TaskResultLine(fragments=[key_fragment, val_fragment],
-                                          need_escape=False, composer=composer)
+                                      need_escape=False, composer=composer)
             lines.append(line)
     else:
         if result is not None: