mirror of
https://git.yoctoproject.org/poky
synced 2026-05-01 15:32:12 +02:00
logging: use warning instead warn
The warn method is deprecated. We should use the documented warning instead.
Quoting from the python's official doc:
"""
Note: There is an obsolete method warn which is functionally identical to warning.
As warn is deprecated, please do not use it - use warning instead.
"""
(From OE-Core rev: cc771aa4b74f222f1bea38b0b50196b2fbc97ab4)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chen Qi
@@ -84,7 +84,7 @@ def export(args, config, basepath, workspace):
|
||||
|
||||
# if all workspace is excluded, quit
|
||||
if not len(set(workspace.keys()).difference(set(args.exclude))):
|
||||
logger.warn('All recipes in workspace excluded, nothing to export')
|
||||
logger.warning('All recipes in workspace excluded, nothing to export')
|
||||
return 0
|
||||
|
||||
exported = []
|
||||
|
||||
@@ -81,7 +81,7 @@ def devimport(args, config, basepath, workspace):
|
||||
break
|
||||
else:
|
||||
non_importables.append(fn)
|
||||
logger.warn('No recipe to append %s.bbapppend, skipping' % fn)
|
||||
logger.warning('No recipe to append %s.bbapppend, skipping' % fn)
|
||||
|
||||
# Extract
|
||||
imported = []
|
||||
@@ -104,9 +104,9 @@ def devimport(args, config, basepath, workspace):
|
||||
try:
|
||||
tar.extract(member, path=config.workspace_path)
|
||||
except PermissionError as pe:
|
||||
logger.warn(pe)
|
||||
logger.warning(pe)
|
||||
else:
|
||||
logger.warn('File already present. Use --overwrite/-o to overwrite it: %s' % member.name)
|
||||
logger.warning('File already present. Use --overwrite/-o to overwrite it: %s' % member.name)
|
||||
continue
|
||||
else:
|
||||
tar.extract(member, path=config.workspace_path)
|
||||
@@ -129,7 +129,7 @@ def devimport(args, config, basepath, workspace):
|
||||
if imported:
|
||||
logger.info('Imported recipes into workspace %s: %s' % (config.workspace_path, ', '.join(imported)))
|
||||
else:
|
||||
logger.warn('No recipes imported into the workspace')
|
||||
logger.warning('No recipes imported into the workspace')
|
||||
|
||||
return 0
|
||||
|
||||
|
||||
@@ -66,7 +66,7 @@ def add(args, config, basepath, workspace):
|
||||
args.srctree = args.recipename
|
||||
args.recipename = None
|
||||
elif os.path.isdir(args.recipename):
|
||||
logger.warn('Ambiguous argument "%s" - assuming you mean it to be the recipe name' % args.recipename)
|
||||
logger.warning('Ambiguous argument "%s" - assuming you mean it to be the recipe name' % args.recipename)
|
||||
|
||||
if not args.fetchuri:
|
||||
if args.srcrev:
|
||||
@@ -82,7 +82,7 @@ def add(args, config, basepath, workspace):
|
||||
if args.fetchuri:
|
||||
raise DevtoolError('URI specified as positional argument as well as -f/--fetch')
|
||||
else:
|
||||
logger.warn('-f/--fetch option is deprecated - you can now simply specify the URL to fetch as a positional argument instead')
|
||||
logger.warning('-f/--fetch option is deprecated - you can now simply specify the URL to fetch as a positional argument instead')
|
||||
args.fetchuri = args.fetch
|
||||
|
||||
if args.recipename:
|
||||
@@ -217,7 +217,7 @@ def add(args, config, basepath, workspace):
|
||||
raise DevtoolError('Command \'%s\' did not create any recipe file:\n%s' % (e.command, e.stdout))
|
||||
attic_recipe = os.path.join(config.workspace_path, 'attic', recipename, os.path.basename(recipefile))
|
||||
if os.path.exists(attic_recipe):
|
||||
logger.warn('A modified recipe from a previous invocation exists in %s - you may wish to move this over the top of the new recipe if you had changes in it that you want to continue with' % attic_recipe)
|
||||
logger.warning('A modified recipe from a previous invocation exists in %s - you may wish to move this over the top of the new recipe if you had changes in it that you want to continue with' % attic_recipe)
|
||||
finally:
|
||||
if tmpsrcdir and os.path.exists(tmpsrcdir):
|
||||
shutil.rmtree(tmpsrcdir)
|
||||
@@ -295,7 +295,7 @@ def add(args, config, basepath, workspace):
|
||||
with open(layerconf_file, 'a') as f:
|
||||
f.write('%s = "%s"\n' % (preferred_provider, recipe_name))
|
||||
else:
|
||||
logger.warn('Set \'%s\' in order to use the recipe' % preferred_provider)
|
||||
logger.warning('Set \'%s\' in order to use the recipe' % preferred_provider)
|
||||
break
|
||||
|
||||
_add_md5(config, recipename, appendfile)
|
||||
@@ -704,7 +704,7 @@ def _check_preserve(config, recipename):
|
||||
if splitline[2] != md5:
|
||||
bb.utils.mkdirhier(preservepath)
|
||||
preservefile = os.path.basename(removefile)
|
||||
logger.warn('File %s modified since it was written, preserving in %s' % (preservefile, preservepath))
|
||||
logger.warning('File %s modified since it was written, preserving in %s' % (preservefile, preservepath))
|
||||
shutil.move(removefile, os.path.join(preservepath, preservefile))
|
||||
else:
|
||||
os.remove(removefile)
|
||||
@@ -795,7 +795,7 @@ def modify(args, config, basepath, workspace):
|
||||
if branchname.startswith(override_branch_prefix):
|
||||
branches.append(branchname)
|
||||
if branches:
|
||||
logger.warn('SRC_URI is conditionally overridden in this recipe, thus several %s* branches have been created, one for each override that makes changes to SRC_URI. It is recommended that you make changes to the %s branch first, then checkout and rebase each %s* branch and update any unique patches there (duplicates on those branches will be ignored by devtool finish/update-recipe)' % (override_branch_prefix, args.branch, override_branch_prefix))
|
||||
logger.warning('SRC_URI is conditionally overridden in this recipe, thus several %s* branches have been created, one for each override that makes changes to SRC_URI. It is recommended that you make changes to the %s branch first, then checkout and rebase each %s* branch and update any unique patches there (duplicates on those branches will be ignored by devtool finish/update-recipe)' % (override_branch_prefix, args.branch, override_branch_prefix))
|
||||
branches.insert(0, args.branch)
|
||||
seen_patches = []
|
||||
for branch in branches:
|
||||
@@ -1720,7 +1720,7 @@ def update_recipe(args, config, basepath, workspace):
|
||||
if updated:
|
||||
rf = rd.getVar('FILE')
|
||||
if rf.startswith(config.workspace_path):
|
||||
logger.warn('Recipe file %s has been updated but is inside the workspace - you will need to move it (and any associated files next to it) out to the desired layer before using "devtool reset" in order to keep any changes' % rf)
|
||||
logger.warning('Recipe file %s has been updated but is inside the workspace - you will need to move it (and any associated files next to it) out to the desired layer before using "devtool reset" in order to keep any changes' % rf)
|
||||
finally:
|
||||
tinfoil.shutdown()
|
||||
|
||||
@@ -1803,7 +1803,7 @@ def _reset(recipes, no_clean, config, basepath, workspace):
|
||||
if os.path.exists(origdir):
|
||||
for root, dirs, files in os.walk(origdir):
|
||||
for fn in files:
|
||||
logger.warn('Preserving %s in %s' % (fn, preservepath))
|
||||
logger.warning('Preserving %s in %s' % (fn, preservepath))
|
||||
_move_file(os.path.join(origdir, fn),
|
||||
os.path.join(preservepath, fn))
|
||||
for dn in dirs:
|
||||
|
||||
@@ -264,7 +264,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee
|
||||
if no_patch:
|
||||
patches = oe.recipeutils.get_recipe_patches(crd)
|
||||
if patches:
|
||||
logger.warn('By user choice, the following patches will NOT be applied to the new source tree:\n %s' % '\n '.join([os.path.basename(patch) for patch in patches]))
|
||||
logger.warning('By user choice, the following patches will NOT be applied to the new source tree:\n %s' % '\n '.join([os.path.basename(patch) for patch in patches]))
|
||||
else:
|
||||
__run('git checkout devtool-patched -b %s' % branch)
|
||||
skiptag = False
|
||||
@@ -273,9 +273,9 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee
|
||||
except bb.process.ExecutionError as e:
|
||||
skiptag = True
|
||||
if 'conflict' in e.stdout:
|
||||
logger.warn('Command \'%s\' failed:\n%s\n\nYou will need to resolve conflicts in order to complete the upgrade.' % (e.command, e.stdout.rstrip()))
|
||||
logger.warning('Command \'%s\' failed:\n%s\n\nYou will need to resolve conflicts in order to complete the upgrade.' % (e.command, e.stdout.rstrip()))
|
||||
else:
|
||||
logger.warn('Command \'%s\' failed:\n%s' % (e.command, e.stdout))
|
||||
logger.warning('Command \'%s\' failed:\n%s' % (e.command, e.stdout))
|
||||
if not skiptag:
|
||||
if uri.startswith('git://'):
|
||||
suffix = 'new'
|
||||
|
||||
@@ -238,7 +238,7 @@ def appendfile(args):
|
||||
if stdout:
|
||||
logger.debug('file command output: %s' % stdout.rstrip())
|
||||
if ('executable' in stdout and not 'shell script' in stdout) or 'shared object' in stdout:
|
||||
logger.warn('This file looks like it is a binary or otherwise the output of compilation. If it is, you should consider building it properly instead of substituting a binary file directly.')
|
||||
logger.warning('This file looks like it is a binary or otherwise the output of compilation. If it is, you should consider building it properly instead of substituting a binary file directly.')
|
||||
|
||||
if args.recipe:
|
||||
recipes = {args.targetpath: [args.recipe],}
|
||||
@@ -275,7 +275,7 @@ def appendfile(args):
|
||||
if selectpn:
|
||||
logger.debug('Selecting recipe %s for file %s' % (selectpn, args.targetpath))
|
||||
if postinst_pns:
|
||||
logger.warn('%s be modified by postinstall scripts for the following recipes:\n %s\nThis may or may not be an issue depending on what modifications these postinstall scripts make.' % (args.targetpath, '\n '.join(postinst_pns)))
|
||||
logger.warning('%s be modified by postinstall scripts for the following recipes:\n %s\nThis may or may not be an issue depending on what modifications these postinstall scripts make.' % (args.targetpath, '\n '.join(postinst_pns)))
|
||||
rd = _parse_recipe(selectpn, tinfoil)
|
||||
if not rd:
|
||||
# Error message already shown
|
||||
@@ -286,12 +286,12 @@ def appendfile(args):
|
||||
sourcetype, sourcepath = sourcefile.split('://', 1)
|
||||
logger.debug('Original source file is %s (%s)' % (sourcepath, sourcetype))
|
||||
if sourcetype == 'patch':
|
||||
logger.warn('File %s is added by the patch %s - you may need to remove or replace this patch in order to replace the file.' % (args.targetpath, sourcepath))
|
||||
logger.warning('File %s is added by the patch %s - you may need to remove or replace this patch in order to replace the file.' % (args.targetpath, sourcepath))
|
||||
sourcepath = None
|
||||
else:
|
||||
logger.debug('Unable to determine source file, proceeding anyway')
|
||||
if modpatches:
|
||||
logger.warn('File %s is modified by the following patches:\n %s' % (args.targetpath, '\n '.join(modpatches)))
|
||||
logger.warning('File %s is modified by the following patches:\n %s' % (args.targetpath, '\n '.join(modpatches)))
|
||||
|
||||
if instelements and sourcepath:
|
||||
install = None
|
||||
@@ -343,7 +343,7 @@ def appendsrc(args, files, rd, extralines=None):
|
||||
if rd.getVar('S') == rd.getVar('STAGING_KERNEL_DIR'):
|
||||
srcdir = os.path.join(workdir, 'git')
|
||||
if not bb.data.inherits_class('kernel-yocto', rd):
|
||||
logger.warn('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${WORKDIR}/git')
|
||||
logger.warning('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${WORKDIR}/git')
|
||||
src_destdir = os.path.join(os.path.relpath(srcdir, workdir), src_destdir)
|
||||
src_destdir = os.path.normpath(src_destdir)
|
||||
|
||||
@@ -357,9 +357,9 @@ def appendsrc(args, files, rd, extralines=None):
|
||||
if simple_str in simplified:
|
||||
existing = simplified[simple_str]
|
||||
if source_uri != existing:
|
||||
logger.warn('{0!r} is already in SRC_URI, with different parameters: {1!r}, not adding'.format(source_uri, existing))
|
||||
logger.warning('{0!r} is already in SRC_URI, with different parameters: {1!r}, not adding'.format(source_uri, existing))
|
||||
else:
|
||||
logger.warn('{0!r} is already in SRC_URI, not adding'.format(source_uri))
|
||||
logger.warning('{0!r} is already in SRC_URI, not adding'.format(source_uri))
|
||||
else:
|
||||
extralines.append('SRC_URI += {0}'.format(source_uri))
|
||||
copyfiles[newfile] = srcfile
|
||||
|
||||
@@ -98,7 +98,7 @@ class RecipeHandler(object):
|
||||
break
|
||||
except IOError as ioe:
|
||||
if ioe.errno == 2:
|
||||
logger.warn('unable to find a pkgdata file for package %s' % pkg)
|
||||
logger.warning('unable to find a pkgdata file for package %s' % pkg)
|
||||
else:
|
||||
raise
|
||||
|
||||
@@ -437,7 +437,7 @@ def create_recipe(args):
|
||||
if scriptutils.is_src_url(source):
|
||||
# Warn about github archive URLs
|
||||
if re.match('https?://github.com/[^/]+/[^/]+/archive/.+(\.tar\..*|\.zip)$', source):
|
||||
logger.warn('github archive files are not guaranteed to be stable and may be re-generated over time. If the latter occurs, the checksums will likely change and the recipe will fail at do_fetch. It is recommended that you point to an actual commit or tag in the repository instead (using the repository URL in conjunction with the -S/--srcrev option).')
|
||||
logger.warning('github archive files are not guaranteed to be stable and may be re-generated over time. If the latter occurs, the checksums will likely change and the recipe will fail at do_fetch. It is recommended that you point to an actual commit or tag in the repository instead (using the repository URL in conjunction with the -S/--srcrev option).')
|
||||
# Fetch a URL
|
||||
fetchuri = reformat_git_uri(urldefrag(source)[0])
|
||||
if args.binary:
|
||||
|
||||
@@ -141,7 +141,7 @@ class KernelModuleRecipeHandler(RecipeHandler):
|
||||
warnmsg = 'Unable to find means of passing kernel path into install makefile - if kernel path is hardcoded you will need to patch the makefile'
|
||||
if warnmsg:
|
||||
warnmsg += '. Note that the variable KERNEL_SRC will be passed in as the kernel source path.'
|
||||
logger.warn(warnmsg)
|
||||
logger.warning(warnmsg)
|
||||
lines_after.append('# %s' % warnmsg)
|
||||
|
||||
return True
|
||||
|
||||
@@ -90,7 +90,7 @@ class NpmRecipeHandler(RecipeHandler):
|
||||
runenv = dict(os.environ, PATH=d.getVar('PATH'))
|
||||
bb.process.run('npm shrinkwrap', cwd=srctree, stderr=subprocess.STDOUT, env=runenv, shell=True)
|
||||
except bb.process.ExecutionError as e:
|
||||
logger.warn('npm shrinkwrap failed:\n%s' % e.stdout)
|
||||
logger.warning('npm shrinkwrap failed:\n%s' % e.stdout)
|
||||
return
|
||||
|
||||
tmpfile = os.path.join(localfilesdir, 'npm-shrinkwrap.json')
|
||||
@@ -107,12 +107,12 @@ class NpmRecipeHandler(RecipeHandler):
|
||||
cwd=srctree, stderr=subprocess.STDOUT, env=runenv, shell=True)
|
||||
relockbin = os.path.join(NpmRecipeHandler.lockdownpath, 'node_modules', 'lockdown', 'relock.js')
|
||||
if not os.path.exists(relockbin):
|
||||
logger.warn('Could not find relock.js within lockdown directory; skipping lockdown')
|
||||
logger.warning('Could not find relock.js within lockdown directory; skipping lockdown')
|
||||
return
|
||||
try:
|
||||
bb.process.run('node %s' % relockbin, cwd=srctree, stderr=subprocess.STDOUT, env=runenv, shell=True)
|
||||
except bb.process.ExecutionError as e:
|
||||
logger.warn('lockdown-relock failed:\n%s' % e.stdout)
|
||||
logger.warning('lockdown-relock failed:\n%s' % e.stdout)
|
||||
return
|
||||
|
||||
tmpfile = os.path.join(localfilesdir, 'lockdown.json')
|
||||
|
||||
@@ -58,11 +58,11 @@ def newappend(args):
|
||||
return 1
|
||||
|
||||
if not path_ok:
|
||||
logger.warn('Unable to determine correct subdirectory path for bbappend file - check that what %s adds to BBFILES also matches .bbappend files. Using %s for now, but until you fix this the bbappend will not be applied.', os.path.join(args.destlayer, 'conf', 'layer.conf'), os.path.dirname(append_path))
|
||||
logger.warning('Unable to determine correct subdirectory path for bbappend file - check that what %s adds to BBFILES also matches .bbappend files. Using %s for now, but until you fix this the bbappend will not be applied.', os.path.join(args.destlayer, 'conf', 'layer.conf'), os.path.dirname(append_path))
|
||||
|
||||
layerdirs = [os.path.abspath(layerdir) for layerdir in rd.getVar('BBLAYERS').split()]
|
||||
if not os.path.abspath(args.destlayer) in layerdirs:
|
||||
logger.warn('Specified layer is not currently enabled in bblayers.conf, you will need to add it before this bbappend will be active')
|
||||
logger.warning('Specified layer is not currently enabled in bblayers.conf, you will need to add it before this bbappend will be active')
|
||||
|
||||
if not os.path.exists(append_path):
|
||||
bb.utils.mkdirhier(os.path.dirname(append_path))
|
||||
|
||||
@@ -506,7 +506,7 @@ class Disk:
|
||||
sparse_copy(partfname, target, seek=part['start'] * self._lsector_size)
|
||||
os.unlink(partfname)
|
||||
elif part['type'] != 'f':
|
||||
logger.warn("skipping partition {}: unsupported fstype {}".format(pnum, fstype))
|
||||
logger.warning("skipping partition {}: unsupported fstype {}".format(pnum, fstype))
|
||||
|
||||
def wic_ls(args, native_sysroot):
|
||||
"""List contents of partitioned image or vfat partition."""
|
||||
|
||||
Reference in New Issue
Block a user