Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

layers: fix move to attic #593

Merged
merged 1 commit into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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