Merge pull request #593 from rhubert/rh-fix-layers-attic

layers: fix move to attic
BobBuildTool · Oct 22, 2024 · 8f5f261 · 8f5f261
2 parents 103c83b + e352b77
commit 8f5f261
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pym/bob/cmds/layers.py b/pym/bob/cmds/layers.py
@@ -36,7 +36,7 @@ def doLayersUpdate(argv):
     parser.add_argument('-D', default=[], action='append', dest="defines",
         help="Override default environment variable")
     group = parser.add_mutually_exclusive_group()
-    group.add_argument('--attic', action='store_true', default=True,
+    group.add_argument('--attic', action='store_true', default=None,
         help="Move scm to attic if inline switch is not possible (default).")
     group.add_argument('--no-attic', action='store_false', default=None, dest='attic',
         help="Do not move to attic, instead fail the build.")

diff --git a/pym/bob/layers.py b/pym/bob/layers.py
@@ -208,7 +208,7 @@ def getScm(self):
 class Layers:
     def __init__(self, defines, attic):
         self.__layers = {}
-        self.__attic = attic
+        self.__attic = attic if attic is not None else True
         self.__defines = defines
         self.__layerConfigFiles = []