Merge lp:~zyga/snapcraft/fix-logging-calls into lp:~snappy-dev/snapcraft/core

[Zygmunt Krynicki]

Correct all the logging calls to pass arguments directly

[Michael Vogt (mvo)]

LGTM.

review: Approve

=== modified file 'snapcraft/__init__.py'
--- snapcraft/__init__.py	2015-08-05 20:43:07 +0000
+++ snapcraft/__init__.py	2015-08-26 09:04:25 +0000
@@ -77,7 +77,7 @@
 
     def pull_hg(self, source, source_tag=None, source_branch=None):
         if source_tag and source_branch:
-            logger.error("You can't specify both source-tag and source-branch for a mercurial source (part '%s')." % self.name)
+            logger.error("You can't specify both source-tag and source-branch for a mercurial source (part '%s').", self.name)
             snapcraft.common.fatal()
 
         if os.path.exists(os.path.join(self.sourcedir, ".hg")):
@@ -96,7 +96,7 @@
 
     def pull_git(self, source, source_tag=None, source_branch=None):
         if source_tag and source_branch:
-            logger.error("You can't specify both source-tag and source-branch for a git source (part '%s')." % self.name)
+            logger.error("You can't specify both source-tag and source-branch for a git source (part '%s').", self.name)
             snapcraft.common.fatal()
 
         if os.path.exists(os.path.join(self.sourcedir, ".git")):
@@ -167,12 +167,12 @@
             elif source.startswith("git:"):
                 source_type = 'git'
             elif self.isurl(source):
-                logger.error("Unrecognized source '%s' for part '%s'." % (source, self.name))
+                logger.error("Unrecognized source '%s' for part '%s'.", source, self.name)
                 snapcraft.common.fatal()
 
         if source_type == 'bzr':
             if source_branch:
-                logger.error("You can't specify source-branch for a bzr source (part '%s')." % self.name)
+                logger.error("You can't specify source-branch for a bzr source (part '%s').", self.name)
                 snapcraft.common.fatal()
             if not self.pull_bzr(source, source_tag=source_tag):
                 return False
@@ -190,10 +190,10 @@
                 return False
         elif source_type == 'tar':
             if source_branch:
-                logger.error("You can't specify source-branch for a tar source (part '%s')." % self.name)
+                logger.error("You can't specify source-branch for a tar source (part '%s').", self.name)
                 snapcraft.common.fatal()
             if source_tag:
-                logger.error("You can't specify source-tag for a tar source (part '%s')." % self.name)
+                logger.error("You can't specify source-tag for a tar source (part '%s').", self.name)
                 snapcraft.common.fatal()
             if not self.pull_tarball(source):
                 return False

=== modified file 'snapcraft/cmds.py'
--- snapcraft/cmds.py	2015-08-05 14:38:33 +0000
+++ snapcraft/cmds.py	2015-08-26 09:04:25 +0000
@@ -216,7 +216,7 @@
         for otherPartName in partsFiles:
             common = partFiles & partsFiles[otherPartName]
             if common:
-                logger.error('Error: parts %s and %s have the following files in common:\n  %s' % (otherPartName, part.names()[0], '\n  '.join(sorted(common))))
+                logger.error('Error: parts %s and %s have the following files in common:\n  %s', otherPartName, part.names()[0], '\n  '.join(sorted(common)))
                 return False
 
         # And add our files to the list
@@ -262,5 +262,5 @@
             common.env = config.build_env_for_part(part)
             force = forceAll or cmd == forceCommand
             if not getattr(part, cmd)(force=force):
-                logger.error('Failed doing %s for %s!' % (cmd, part.names()[0]))
+                logger.error('Failed doing %s for %s!', cmd, part.names()[0])
                 sys.exit(1)

=== modified file 'snapcraft/plugin.py'
--- snapcraft/plugin.py	2015-08-05 14:25:54 +0000
+++ snapcraft/plugin.py	2015-08-26 09:04:25 +0000
@@ -266,6 +266,6 @@
 def load_plugin(part_name, plugin_name, properties={}, load_code=True):
     part = PluginHandler(plugin_name, part_name, properties, load_code=load_code)
     if not part.is_valid():
-        logger.error('Could not load part {}'.format(plugin_name))
+        logger.error('Could not load part %s', plugin_name)
         sys.exit(1)
     return part

=== modified file 'snapcraft/plugins/ant_project.py'
--- snapcraft/plugins/ant_project.py	2015-07-23 14:23:29 +0000
+++ snapcraft/plugins/ant_project.py	2015-08-26 09:04:25 +0000
@@ -36,7 +36,7 @@
             return False
         files = glob.glob(os.path.join(self.builddir, 'target', '*.jar'))
         if not files:
-            logger.error('Could not find any built jar files for part %s' % self.name)
+            logger.error('Could not find any built jar files for part %s', self.name)
             sys.exit(1)
         jardir = os.path.join(self.installdir, 'jar')
         return self.run(['mkdir', '-p', jardir]) and \

=== modified file 'snapcraft/plugins/copy.py'
--- snapcraft/plugins/copy.py	2015-07-30 18:46:42 +0000
+++ snapcraft/plugins/copy.py	2015-08-26 09:04:25 +0000
@@ -30,7 +30,7 @@
         for src in sorted(self.options.files):
             dst = self.options.files[src]
             if not os.path.lexists(src):
-                logger.warning("WARNING: file '%s' missing" % src)
+                logger.warning("WARNING: file '%s' missing", src)
                 res = False
                 continue
             dst = os.path.join(self.installdir, dst)

=== modified file 'snapcraft/plugins/maven_project.py'
--- snapcraft/plugins/maven_project.py	2015-08-18 11:25:21 +0000
+++ snapcraft/plugins/maven_project.py	2015-08-26 09:04:25 +0000
@@ -36,7 +36,7 @@
         jarfiles = glob.glob(os.path.join(self.builddir, 'target', '*.jar'))
         warfiles = glob.glob(os.path.join(self.builddir, 'target', '*.war'))
         if not (jarfiles or warfiles):
-            logger.error('Could not find any built jar or war files for part {}'.format(self.name))
+            logger.error('Could not find any built jar or war files for part %s', self.name)
             snapcraft.common.fatal()
         if jarfiles:
             jardir = os.path.join(self.installdir, 'jar')

=== modified file 'snapcraft/plugins/ubuntu.py'
--- snapcraft/plugins/ubuntu.py	2015-08-06 11:18:47 +0000
+++ snapcraft/plugins/ubuntu.py	2015-08-26 09:04:25 +0000
@@ -39,7 +39,7 @@
         else:
             # User didn't specify a package, use the part name
             if name == 'ubuntu':
-                logger.error('Part %s needs either a package option or a name' % name)
+                logger.error('Part %s needs either a package option or a name', name)
                 sys.exit(1)
             self.included_packages.append(name)
 
@@ -94,7 +94,7 @@
         for p in packages:
             if p not in alldeps:
                 exit = True
-                logger.error("Package '{}' not recognized".format(p))
+                logger.error("Package '%s' not recognized", p)
         if exit:
             sys.exit(1)
 

=== modified file 'snapcraft/yaml.py'
--- snapcraft/yaml.py	2015-07-31 20:14:25 +0000
+++ snapcraft/yaml.py	2015-08-26 09:04:25 +0000
@@ -81,7 +81,7 @@
                         foundIt = True
                         break
                 if not foundIt:
-                    logger.error("Could not find part name %s" % dep)
+                    logger.error("Could not find part name %s", dep)
                     sys.exit(1)
 
         # Now sort them (this is super inefficient, but easy-ish to follow)