← Back to branch summary

~jamesodhunt/ubuntu-system-image/system-image-server-remove-slash-android-for-ubuntu-core

« back to all changes in this revision

Viewing changes to bin/import-images

  • Committer: Stéphane Graber
  • Date: 2014-08-27 22:10:37 UTC
  • Revision ID: stgraber@ubuntu.com-20140827221037-9d3gmdr5sya30thj
Fix variable names conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/import-images
154
154
            for file_entry in channel.files:
155
155
                # Deal with device specific overrides
156
156
                if "," in file_entry['name']:
157
 
                    filename, device = file_entry['name'].split(',', 1)
158
 
                    if device != device_name:
 
157
                    file_name, file_device = file_entry['name'].split(',', 1)
 
158
                    if file_device != device_name:
159
159
                        logging.debug("Skipping '%s' because the device name"
160
160
                                      "doesn't match" % file_entry['name'])
161
161
                        continue
162
162
                else:
163
 
                    filename = file_entry['name']
 
163
                    file_name = file_entry['name']
164
164
 
165
 
                if filename in processed_files:
 
165
                if file_name in processed_files:
166
166
                    logging.debug("Skipping '%s' because a more specific"
167
167
                                  "generator was already called."
168
168
                                  % file_entry['name'])
169
169
                    continue
170
170
 
171
 
                processed_files.append(filename)
 
171
                processed_files.append(file_name)
172
172
 
173
173
                # Generate the environment
174
174
                environment = {}