aboutsummaryrefslogtreecommitdiffstats
path: root/layerindex/update_layer.py
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-06-07 12:36:52 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2016-06-12 11:33:08 +1200
commita6054920df0384b79c61eeaeceea1eda6c89c8d5 (patch)
tree1b15bb33aa5e3ab8b6c97627436b43d68d3b962b /layerindex/update_layer.py
parent29c6458dcafd5970ddac95184348aeaf23b756fe (diff)
downloadopenembedded-core-contrib-a6054920df0384b79c61eeaeceea1eda6c89c8d5.tar.gz
update_layer.py: rename confusing loop variables
Stop using "d" (sometimes multiple levels!) and use proper descriptive variable names instead. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'layerindex/update_layer.py')
-rw-r--r--layerindex/update_layer.py40
1 files changed, 20 insertions, 20 deletions
diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py
index bf1dbb2a38..ac4ae1e6d1 100644
--- a/layerindex/update_layer.py
+++ b/layerindex/update_layer.py
@@ -312,9 +312,9 @@ def main():
# Check if any paths should be ignored because there are layers within this layer
removedirs = []
for root, dirs, files in os.walk(layerdir):
- for d in dirs:
- if os.path.exists(os.path.join(root, d, 'conf', 'layer.conf')):
- removedirs.append(os.path.join(root, d) + os.sep)
+ for diritem in dirs:
+ if os.path.exists(os.path.join(root, diritem, 'conf', 'layer.conf')):
+ removedirs.append(os.path.join(root, diritem) + os.sep)
if diff:
# Apply git changes to existing recipe list
@@ -325,12 +325,12 @@ def main():
subdir_start = ""
updatedrecipes = set()
- for d in diff.iter_change_type('D'):
- path = d.a_blob.path
+ for diffitem in diff.iter_change_type('D'):
+ path = diffitem.a_blob.path
if path.startswith(subdir_start):
skip = False
- for d in removedirs:
- if path.startswith(d):
+ for removedir in removedirs:
+ if path.startswith(removedir):
skip = True
break
if skip:
@@ -351,12 +351,12 @@ def main():
elif typename == 'bbclass':
layerclasses.filter(name=filename).delete()
- for d in diff.iter_change_type('A'):
- path = d.b_blob.path
+ for diffitem in diff.iter_change_type('A'):
+ path = diffitem.b_blob.path
if path.startswith(subdir_start):
skip = False
- for d in removedirs:
- if path.startswith(d):
+ for removedir in removedirs:
+ if path.startswith(removedir):
skip = True
break
if skip:
@@ -385,12 +385,12 @@ def main():
bbclass.save()
dirtyrecipes = set()
- for d in diff.iter_change_type('M'):
- path = d.a_blob.path
+ for diffitem in diff.iter_change_type('M'):
+ path = diffitem.a_blob.path
if path.startswith(subdir_start):
skip = False
- for d in removedirs:
- if path.startswith(d):
+ for removedir in removedirs:
+ if path.startswith(removedir):
skip = True
break
if skip:
@@ -432,8 +432,8 @@ def main():
fullpath = os.path.join(root, v['filename'])
preserve = True
if os.path.exists(fullpath):
- for d in removedirs:
- if fullpath.startswith(d):
+ for removedir in removedirs:
+ if fullpath.startswith(removedir):
preserve = False
break
else:
@@ -455,10 +455,10 @@ def main():
for root, dirs, files in os.walk(layerdir):
if '.git' in dirs:
dirs.remove('.git')
- for d in dirs[:]:
- fullpath = os.path.join(root, d) + os.sep
+ for diritem in dirs[:]:
+ fullpath = os.path.join(root, diritem) + os.sep
if fullpath in removedirs:
- dirs.remove(d)
+ dirs.remove(diritem)
for f in files:
fullpath = os.path.join(root, f)
(typename, _, filename) = recipeparse.detect_file_type(fullpath, layerdir_start)