summaryrefslogtreecommitdiffstats
path: root/scripts/lib/recipetool/append.py
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-07-19 13:47:18 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-26 13:16:40 +0100
commit869e501544960f638edfe17c9d7500b54d05837e (patch)
treef6967d2d1648f92fd2ec780b02971e0eb8f4c2e4 /scripts/lib/recipetool/append.py
parent53b50b5d11dfd6f299116edc7254ebc1f29f19e5 (diff)
downloadpoky-869e501544960f638edfe17c9d7500b54d05837e.tar.gz
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: f467fd277eb77336097cfc0f5f329bdc8d0f70cb) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/recipetool/append.py')
-rw-r--r--scripts/lib/recipetool/append.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index 69c8bb77a0..3f2c134ad5 100644
--- a/scripts/lib/recipetool/append.py
+++ b/scripts/lib/recipetool/append.py
@@ -238,7 +238,7 @@ def appendfile(args):
238 if stdout: 238 if stdout:
239 logger.debug('file command output: %s' % stdout.rstrip()) 239 logger.debug('file command output: %s' % stdout.rstrip())
240 if ('executable' in stdout and not 'shell script' in stdout) or 'shared object' in stdout: 240 if ('executable' in stdout and not 'shell script' in stdout) or 'shared object' in stdout:
241 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.') 241 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.')
242 242
243 if args.recipe: 243 if args.recipe:
244 recipes = {args.targetpath: [args.recipe],} 244 recipes = {args.targetpath: [args.recipe],}
@@ -275,7 +275,7 @@ def appendfile(args):
275 if selectpn: 275 if selectpn:
276 logger.debug('Selecting recipe %s for file %s' % (selectpn, args.targetpath)) 276 logger.debug('Selecting recipe %s for file %s' % (selectpn, args.targetpath))
277 if postinst_pns: 277 if postinst_pns:
278 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))) 278 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)))
279 rd = _parse_recipe(selectpn, tinfoil) 279 rd = _parse_recipe(selectpn, tinfoil)
280 if not rd: 280 if not rd:
281 # Error message already shown 281 # Error message already shown
@@ -286,12 +286,12 @@ def appendfile(args):
286 sourcetype, sourcepath = sourcefile.split('://', 1) 286 sourcetype, sourcepath = sourcefile.split('://', 1)
287 logger.debug('Original source file is %s (%s)' % (sourcepath, sourcetype)) 287 logger.debug('Original source file is %s (%s)' % (sourcepath, sourcetype))
288 if sourcetype == 'patch': 288 if sourcetype == 'patch':
289 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)) 289 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))
290 sourcepath = None 290 sourcepath = None
291 else: 291 else:
292 logger.debug('Unable to determine source file, proceeding anyway') 292 logger.debug('Unable to determine source file, proceeding anyway')
293 if modpatches: 293 if modpatches:
294 logger.warn('File %s is modified by the following patches:\n %s' % (args.targetpath, '\n '.join(modpatches))) 294 logger.warning('File %s is modified by the following patches:\n %s' % (args.targetpath, '\n '.join(modpatches)))
295 295
296 if instelements and sourcepath: 296 if instelements and sourcepath:
297 install = None 297 install = None
@@ -343,7 +343,7 @@ def appendsrc(args, files, rd, extralines=None):
343 if rd.getVar('S') == rd.getVar('STAGING_KERNEL_DIR'): 343 if rd.getVar('S') == rd.getVar('STAGING_KERNEL_DIR'):
344 srcdir = os.path.join(workdir, 'git') 344 srcdir = os.path.join(workdir, 'git')
345 if not bb.data.inherits_class('kernel-yocto', rd): 345 if not bb.data.inherits_class('kernel-yocto', rd):
346 logger.warn('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${WORKDIR}/git') 346 logger.warning('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${WORKDIR}/git')
347 src_destdir = os.path.join(os.path.relpath(srcdir, workdir), src_destdir) 347 src_destdir = os.path.join(os.path.relpath(srcdir, workdir), src_destdir)
348 src_destdir = os.path.normpath(src_destdir) 348 src_destdir = os.path.normpath(src_destdir)
349 349
@@ -357,9 +357,9 @@ def appendsrc(args, files, rd, extralines=None):
357 if simple_str in simplified: 357 if simple_str in simplified:
358 existing = simplified[simple_str] 358 existing = simplified[simple_str]
359 if source_uri != existing: 359 if source_uri != existing:
360 logger.warn('{0!r} is already in SRC_URI, with different parameters: {1!r}, not adding'.format(source_uri, existing)) 360 logger.warning('{0!r} is already in SRC_URI, with different parameters: {1!r}, not adding'.format(source_uri, existing))
361 else: 361 else:
362 logger.warn('{0!r} is already in SRC_URI, not adding'.format(source_uri)) 362 logger.warning('{0!r} is already in SRC_URI, not adding'.format(source_uri))
363 else: 363 else:
364 extralines.append('SRC_URI += {0}'.format(source_uri)) 364 extralines.append('SRC_URI += {0}'.format(source_uri))
365 copyfiles[newfile] = srcfile 365 copyfiles[newfile] = srcfile