Skip to content

Commit

Permalink
layers: fix move to attic
Browse files Browse the repository at this point in the history
When the layers where updated from bob build/dev move to attic was
disabled by default.
As the unittest only tests the attic move from `bob layers update`
this has been overlooked as attic is True in this case while it's
None for build/dev. Adapt the default for the layers update command
to match the default from build/dev.
  • Loading branch information
rhubert committed Oct 22, 2024
1 parent 103c83b commit e352b77
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pym/bob/cmds/layers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
2 changes: 1 addition & 1 deletion pym/bob/layers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []

Expand Down

0 comments on commit e352b77

Please sign in to comment.