diff options
Diffstat (limited to 'scripts/lib/devtool/standard.py')
-rw-r--r-- | scripts/lib/devtool/standard.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index d6186b9ece..08153c6edc 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -1091,11 +1091,11 @@ def _update_recipe_srcrev(args, srctree, rd, config_data): | |||
1091 | else: | 1091 | else: |
1092 | files_dir = os.path.join(os.path.dirname(recipefile), | 1092 | files_dir = os.path.join(os.path.dirname(recipefile), |
1093 | rd.getVar('BPN', True)) | 1093 | rd.getVar('BPN', True)) |
1094 | for basepath, path in upd_f.iteritems(): | 1094 | for basepath, path in upd_f.items(): |
1095 | logger.info('Updating file %s' % basepath) | 1095 | logger.info('Updating file %s' % basepath) |
1096 | _move_file(os.path.join(local_files_dir, basepath), path) | 1096 | _move_file(os.path.join(local_files_dir, basepath), path) |
1097 | update_srcuri= True | 1097 | update_srcuri= True |
1098 | for basepath, path in new_f.iteritems(): | 1098 | for basepath, path in new_f.items(): |
1099 | logger.info('Adding new file %s' % basepath) | 1099 | logger.info('Adding new file %s' % basepath) |
1100 | _move_file(os.path.join(local_files_dir, basepath), | 1100 | _move_file(os.path.join(local_files_dir, basepath), |
1101 | os.path.join(files_dir, basepath)) | 1101 | os.path.join(files_dir, basepath)) |
@@ -1173,11 +1173,11 @@ def _update_recipe_patch(args, config, workspace, srctree, rd, config_data): | |||
1173 | logger.info('No patches or local source files needed updating') | 1173 | logger.info('No patches or local source files needed updating') |
1174 | else: | 1174 | else: |
1175 | # Update existing files | 1175 | # Update existing files |
1176 | for basepath, path in upd_f.iteritems(): | 1176 | for basepath, path in upd_f.items(): |
1177 | logger.info('Updating file %s' % basepath) | 1177 | logger.info('Updating file %s' % basepath) |
1178 | _move_file(os.path.join(local_files_dir, basepath), path) | 1178 | _move_file(os.path.join(local_files_dir, basepath), path) |
1179 | updatefiles = True | 1179 | updatefiles = True |
1180 | for basepath, path in upd_p.iteritems(): | 1180 | for basepath, path in upd_p.items(): |
1181 | patchfn = os.path.join(patches_dir, basepath) | 1181 | patchfn = os.path.join(patches_dir, basepath) |
1182 | if changed_revs is not None: | 1182 | if changed_revs is not None: |
1183 | # Avoid updating patches that have not actually changed | 1183 | # Avoid updating patches that have not actually changed |
@@ -1192,13 +1192,13 @@ def _update_recipe_patch(args, config, workspace, srctree, rd, config_data): | |||
1192 | # Add any new files | 1192 | # Add any new files |
1193 | files_dir = os.path.join(os.path.dirname(recipefile), | 1193 | files_dir = os.path.join(os.path.dirname(recipefile), |
1194 | rd.getVar('BPN', True)) | 1194 | rd.getVar('BPN', True)) |
1195 | for basepath, path in new_f.iteritems(): | 1195 | for basepath, path in new_f.items(): |
1196 | logger.info('Adding new file %s' % basepath) | 1196 | logger.info('Adding new file %s' % basepath) |
1197 | _move_file(os.path.join(local_files_dir, basepath), | 1197 | _move_file(os.path.join(local_files_dir, basepath), |
1198 | os.path.join(files_dir, basepath)) | 1198 | os.path.join(files_dir, basepath)) |
1199 | srcuri.append('file://%s' % basepath) | 1199 | srcuri.append('file://%s' % basepath) |
1200 | updaterecipe = True | 1200 | updaterecipe = True |
1201 | for basepath, path in new_p.iteritems(): | 1201 | for basepath, path in new_p.items(): |
1202 | logger.info('Adding new patch %s' % basepath) | 1202 | logger.info('Adding new patch %s' % basepath) |
1203 | _move_file(os.path.join(patches_dir, basepath), | 1203 | _move_file(os.path.join(patches_dir, basepath), |
1204 | os.path.join(files_dir, basepath)) | 1204 | os.path.join(files_dir, basepath)) |
@@ -1285,7 +1285,7 @@ def update_recipe(args, config, basepath, workspace): | |||
1285 | def status(args, config, basepath, workspace): | 1285 | def status(args, config, basepath, workspace): |
1286 | """Entry point for the devtool 'status' subcommand""" | 1286 | """Entry point for the devtool 'status' subcommand""" |
1287 | if workspace: | 1287 | if workspace: |
1288 | for recipe, value in workspace.iteritems(): | 1288 | for recipe, value in workspace.items(): |
1289 | recipefile = value['recipefile'] | 1289 | recipefile = value['recipefile'] |
1290 | if recipefile: | 1290 | if recipefile: |
1291 | recipestr = ' (%s)' % recipefile | 1291 | recipestr = ' (%s)' % recipefile |