]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
debian_build.py: Fix W1201 'Specify string format arguments as logging function param...
authorBenjamin Drung <benjamin.drung@profitbricks.com>
Tue, 26 Aug 2014 12:39:39 +0000 (14:39 +0200)
committerBenjamin Drung <benjamin.drung@profitbricks.com>
Tue, 26 Aug 2014 12:39:39 +0000 (14:39 +0200)
debian_build.py

index cc8dda7026dcbcc411845f1881f274dc520f09ac..846b9a8a4c0dadf31677355193e2c35538f73bbd 100755 (executable)
@@ -242,8 +242,8 @@ def main():
         repo_name = re.sub(r'\.git$', '', gitrepo.remotes['origin']['fetch'].split('/')[-1])
     else:
         repo_name = re.sub(r'\.git$', '', gitrepo.remotes['origin'].url.split('/')[-1])
-    logger.info('Remotes: %s' % gitrepo.remotes)
-    logger.info('Repository Name: %s' % repo_name)
+    logger.info('Remotes: %s', gitrepo.remotes)
+    logger.info('Repository Name: %s', repo_name)
 
     # .. some local variables
     local_branch = re.match('^(origin/)?(.*)', ENV['GIT_BRANCH']).groups()[1]
@@ -494,9 +494,9 @@ def main():
             cmd = [BIN_SUDO, BIN_RM, "-r", source_package_dir]
             command = ' '.join(cmd)
             if subprocess.call(cmd) == 0:
-                logger.debug('%s succeeded.' % command)
+                logger.debug('%s succeeded.', command)
             else:
-                logger.warn('%s failed.' % command)
+                logger.warn('%s failed.', command)
 
         # .. and also cleanup existing *orig.tar.gz
         if os.path.isdir(BUILD_AREA):
@@ -511,9 +511,9 @@ def main():
                 cmd = [BIN_SUDO, BIN_RM] + files
                 command = ' '.join(cmd)
                 if subprocess.call(cmd) == 0:
-                    logger.debug('%s succeeded.' % command)
+                    logger.debug('%s succeeded.', command)
                 else:
-                    logger.warn('%s failed.' % command)
+                    logger.warn('%s failed.', command)
 
         figlet('Cleanup OK')
 
@@ -539,7 +539,7 @@ def main():
                 logger.info('Rebase and merge from branch "{src_branch}" completed. Now in '
                             '"{dst_branch}".'.format(dst_branch=dst_branch, src_branch=src_branch))
             except Exception as error:
-                logger.error('Rebase has failed!\n\n%s\n' % error.stderr, exc_info=error)
+                logger.error('Rebase has failed!\n\n%s\n', error.stderr, exc_info=error)
                 logger.debug(gitrepo.git.rebase('--abort'))
                 logger.debug(gitrepo.git.reset('--hard', src_branch))
                 if os.path.exists('.git/rebase-apply'):
@@ -576,7 +576,7 @@ def main():
             new_version = changelog.full_version
             new_tag = new_version.replace('~', '_').replace(':', ',')
         except Exception as error:
-            logger.error('Autoincrement failed. Standard error returned:\n\n%s\n' %
+            logger.error('Autoincrement failed. Standard error returned:\n\n%s\n',
                          error.stderr, exc_info=error)
             exit_error()
 
@@ -724,7 +724,7 @@ def main():
             else:
                 logger.info('No reports found.')
             figlet('Reports OK')
-        except:
+        except Exception:
             pass
 
     # now fail if build failed
@@ -783,7 +783,7 @@ def main():
                 process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
                 changes = process.communicate()[0]
                 if process.returncode == 0:
-                    logger.debug('%s succeeded.' % command)
+                    logger.debug('%s succeeded.', command)
 
                     (head, tail) = os.path.splitext(changes_file)
                     legacy_changes_file = os.path.abspath(head) + '_alexandria' + tail
@@ -796,7 +796,7 @@ def main():
 
                     figlet('Legacy upload OK')
                 else:
-                    logger.warn('%s failed.' % command)
+                    logger.warn('%s failed.', command)
                     figlet('Legacy upload failed')
         except Exception as error:
             logger.error('Legacy upload failed. See above for details.', exc_info=error)