diff options
Diffstat (limited to 'scripts/lib/devtool/standard.py')
-rw-r--r-- | scripts/lib/devtool/standard.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index a1e8e1d322..d14b7a6543 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -66,7 +66,7 @@ def add(args, config, basepath, workspace): | |||
66 | args.srctree = args.recipename | 66 | args.srctree = args.recipename |
67 | args.recipename = None | 67 | args.recipename = None |
68 | elif os.path.isdir(args.recipename): | 68 | elif os.path.isdir(args.recipename): |
69 | logger.warn('Ambiguous argument "%s" - assuming you mean it to be the recipe name' % args.recipename) | 69 | logger.warning('Ambiguous argument "%s" - assuming you mean it to be the recipe name' % args.recipename) |
70 | 70 | ||
71 | if not args.fetchuri: | 71 | if not args.fetchuri: |
72 | if args.srcrev: | 72 | if args.srcrev: |
@@ -82,7 +82,7 @@ def add(args, config, basepath, workspace): | |||
82 | if args.fetchuri: | 82 | if args.fetchuri: |
83 | raise DevtoolError('URI specified as positional argument as well as -f/--fetch') | 83 | raise DevtoolError('URI specified as positional argument as well as -f/--fetch') |
84 | else: | 84 | else: |
85 | logger.warn('-f/--fetch option is deprecated - you can now simply specify the URL to fetch as a positional argument instead') | 85 | logger.warning('-f/--fetch option is deprecated - you can now simply specify the URL to fetch as a positional argument instead') |
86 | args.fetchuri = args.fetch | 86 | args.fetchuri = args.fetch |
87 | 87 | ||
88 | if args.recipename: | 88 | if args.recipename: |
@@ -217,7 +217,7 @@ def add(args, config, basepath, workspace): | |||
217 | raise DevtoolError('Command \'%s\' did not create any recipe file:\n%s' % (e.command, e.stdout)) | 217 | raise DevtoolError('Command \'%s\' did not create any recipe file:\n%s' % (e.command, e.stdout)) |
218 | attic_recipe = os.path.join(config.workspace_path, 'attic', recipename, os.path.basename(recipefile)) | 218 | attic_recipe = os.path.join(config.workspace_path, 'attic', recipename, os.path.basename(recipefile)) |
219 | if os.path.exists(attic_recipe): | 219 | if os.path.exists(attic_recipe): |
220 | 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) | 220 | 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) |
221 | finally: | 221 | finally: |
222 | if tmpsrcdir and os.path.exists(tmpsrcdir): | 222 | if tmpsrcdir and os.path.exists(tmpsrcdir): |
223 | shutil.rmtree(tmpsrcdir) | 223 | shutil.rmtree(tmpsrcdir) |
@@ -295,7 +295,7 @@ def add(args, config, basepath, workspace): | |||
295 | with open(layerconf_file, 'a') as f: | 295 | with open(layerconf_file, 'a') as f: |
296 | f.write('%s = "%s"\n' % (preferred_provider, recipe_name)) | 296 | f.write('%s = "%s"\n' % (preferred_provider, recipe_name)) |
297 | else: | 297 | else: |
298 | logger.warn('Set \'%s\' in order to use the recipe' % preferred_provider) | 298 | logger.warning('Set \'%s\' in order to use the recipe' % preferred_provider) |
299 | break | 299 | break |
300 | 300 | ||
301 | _add_md5(config, recipename, appendfile) | 301 | _add_md5(config, recipename, appendfile) |
@@ -704,7 +704,7 @@ def _check_preserve(config, recipename): | |||
704 | if splitline[2] != md5: | 704 | if splitline[2] != md5: |
705 | bb.utils.mkdirhier(preservepath) | 705 | bb.utils.mkdirhier(preservepath) |
706 | preservefile = os.path.basename(removefile) | 706 | preservefile = os.path.basename(removefile) |
707 | logger.warn('File %s modified since it was written, preserving in %s' % (preservefile, preservepath)) | 707 | logger.warning('File %s modified since it was written, preserving in %s' % (preservefile, preservepath)) |
708 | shutil.move(removefile, os.path.join(preservepath, preservefile)) | 708 | shutil.move(removefile, os.path.join(preservepath, preservefile)) |
709 | else: | 709 | else: |
710 | os.remove(removefile) | 710 | os.remove(removefile) |
@@ -795,7 +795,7 @@ def modify(args, config, basepath, workspace): | |||
795 | if branchname.startswith(override_branch_prefix): | 795 | if branchname.startswith(override_branch_prefix): |
796 | branches.append(branchname) | 796 | branches.append(branchname) |
797 | if branches: | 797 | if branches: |
798 | 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)) | 798 | 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)) |
799 | branches.insert(0, args.branch) | 799 | branches.insert(0, args.branch) |
800 | seen_patches = [] | 800 | seen_patches = [] |
801 | for branch in branches: | 801 | for branch in branches: |
@@ -1720,7 +1720,7 @@ def update_recipe(args, config, basepath, workspace): | |||
1720 | if updated: | 1720 | if updated: |
1721 | rf = rd.getVar('FILE') | 1721 | rf = rd.getVar('FILE') |
1722 | if rf.startswith(config.workspace_path): | 1722 | if rf.startswith(config.workspace_path): |
1723 | 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) | 1723 | 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) |
1724 | finally: | 1724 | finally: |
1725 | tinfoil.shutdown() | 1725 | tinfoil.shutdown() |
1726 | 1726 | ||
@@ -1803,7 +1803,7 @@ def _reset(recipes, no_clean, config, basepath, workspace): | |||
1803 | if os.path.exists(origdir): | 1803 | if os.path.exists(origdir): |
1804 | for root, dirs, files in os.walk(origdir): | 1804 | for root, dirs, files in os.walk(origdir): |
1805 | for fn in files: | 1805 | for fn in files: |
1806 | logger.warn('Preserving %s in %s' % (fn, preservepath)) | 1806 | logger.warning('Preserving %s in %s' % (fn, preservepath)) |
1807 | _move_file(os.path.join(origdir, fn), | 1807 | _move_file(os.path.join(origdir, fn), |
1808 | os.path.join(preservepath, fn)) | 1808 | os.path.join(preservepath, fn)) |
1809 | for dn in dirs: | 1809 | for dn in dirs: |