tools: moveconfig: fix --dry-run option

Since commit 96464badc794 ("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 96464badc794 ("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>

1 files changed, 7 insertions, 8 deletions

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