GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-31 03:21:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools: moveconfig: fix --dry-run option

Browse source 
Since commit 96464badc7 ("moveconfig: Always run savedefconfig on
the moved config"), --dry-run option is broken.

The --dry-run option prevents the .config from being modified,
but defconfig files might be updated by "make savedefconfig"
regardless of the --dry-run option.

Move the "if not self.options.dry_run" conditional to the correct
place.

Fixes 96464badc7 ("moveconfig: Always run savedefconfig on the moved config")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Masahiro Yamada 2016-05-19 15:51:49 +09:00
parent 6b3943f1b0
commit e423d17fcc
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tools/moveconfig.py
View file

@ -511,11 +511,10 @@ class KconfigParser:
# Print log in one shot to not mix up logs from different threads. # Print log in one shot to not mix up logs from different threads.
print log, print log,
if not self.options.dry_run: with open(dotconfig_path, 'a') as f:
with open(dotconfig_path, 'a') as f: for (action, value) in results:
for (action, value) in results: if action == ACTION_MOVE:
if action == ACTION_MOVE: f.write(value + '\n')
f.write(value + '\n')
os.remove(os.path.join(self.build_dir, 'include', 'config', 'auto.conf')) os.remove(os.path.join(self.build_dir, 'include', 'config', 'auto.conf'))
os.remove(autoconf_path) os.remove(autoconf_path)
@ -647,9 +646,9 @@ class Slot:
return False return False
if self.state == STATE_SAVEDEFCONFIG: if self.state == STATE_SAVEDEFCONFIG:
defconfig_path = os.path.join(self.build_dir, 'defconfig') if not self.options.dry_run:
shutil.move(defconfig_path, shutil.move(os.path.join(self.build_dir, 'defconfig'),
os.path.join('configs', self.defconfig)) os.path.join('configs', self.defconfig))
self.state = STATE_IDLE self.state = STATE_IDLE
return True return True