diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-07 13:55:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 14:04:18 +0100 |
commit | 754874e68d1037c76fc4cc7d35d3fa12946d00f8 (patch) | |
tree | 388b49f9cd24d1ed8574bca955e92a6532844056 | |
parent | dde7af5f6c769eae721b1ee18462b841c8ea3277 (diff) | |
download | openembedded-core-754874e68d1037c76fc4cc7d35d3fa12946d00f8.tar.gz openembedded-core-754874e68d1037c76fc4cc7d35d3fa12946d00f8.tar.bz2 openembedded-core-754874e68d1037c76fc4cc7d35d3fa12946d00f8.zip |
classes/lib: Update to use print as a function call
In python 3 print is a function call. In some cases bb.note is a more
appropriate call to make.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/sanity.bbclass | 6 | ||||
-rw-r--r-- | meta/classes/sstate.bbclass | 6 | ||||
-rw-r--r-- | meta/lib/oe/path.py | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 601ef1fb70..17420a8767 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -367,7 +367,9 @@ def check_sanity(sanity_data): try: from distutils.version import LooseVersion except ImportError: - def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1 + def LooseVersion(v): + print("WARNING: sanity.bbclass can't compare versions without python-distutils") + return 1 import commands # Check the bitbake version meets minimum requirements @@ -375,7 +377,7 @@ def check_sanity(sanity_data): if not minversion: # Hack: BB_MIN_VERSION hasn't been parsed yet so return # and wait for the next call - print "Foo %s" % minversion + print("Foo %s" % minversion) return if 0 == os.getuid(): diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 77ec402704..9a76a6b3cc 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -261,7 +261,7 @@ def sstate_installpkg(ss, d): # Add sstateinst to each filename in fixmepath, use xargs to efficiently call sed sstate_hardcode_cmd = "sed -e 's:^:%s:g' %s | xargs %s" % (sstateinst, fixmefn, sstate_sed_cmd) - print "Replacing fixme paths in sstate package: %s" % (sstate_hardcode_cmd) + bb.note("Replacing fixme paths in sstate package: %s" % (sstate_hardcode_cmd)) subprocess.call(sstate_hardcode_cmd, shell=True) # Need to remove this or we'd copy it into the target directory and may @@ -408,14 +408,14 @@ def sstate_hardcode_path(d): # This has the side effect of making sure the vfs cache is hot sstate_hardcode_cmd = "%s | xargs %s | %s | xargs %s %s" % (sstate_scan_cmd, sstate_grep_cmd, sstate_filelist_cmd, xargs_no_empty_run_cmd, sstate_sed_cmd) - print "Removing hardcoded paths from sstate package: '%s'" % (sstate_hardcode_cmd) + bb.note("Removing hardcoded paths from sstate package: '%s'" % (sstate_hardcode_cmd)) subprocess.call(sstate_hardcode_cmd, shell=True) # If the fixmefn is empty, remove it.. if os.stat(fixmefn).st_size == 0: os.remove(fixmefn) else: - print "Replacing absolute paths in fixmepath file: '%s'" % (sstate_filelist_relative_cmd) + bb.note("Replacing absolute paths in fixmepath file: '%s'" % (sstate_filelist_relative_cmd)) subprocess.call(sstate_filelist_relative_cmd, shell=True) def sstate_package(ss, d): diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py index d8eb80225f..da044ba8c8 100644 --- a/meta/lib/oe/path.py +++ b/meta/lib/oe/path.py @@ -55,7 +55,7 @@ def make_relative_symlink(path): depth += 1 if not ancestor: - print "make_relative_symlink() Error: unable to find the common ancestor of %s and its target" % path + print("make_relative_symlink() Error: unable to find the common ancestor of %s and its target" % path) return base = link.partition(ancestor)[2].strip('/') |