Skip to content
Snippets Groups Projects
Commit 743a3f0d authored by Simon McVittie's avatar Simon McVittie
Browse files

Allow apt sources to be marked as only for the build or the final product

parent 7a8219f8
No related branches found
No related tags found
No related merge requests found
...@@ -494,11 +494,13 @@ class Builder: ...@@ -494,11 +494,13 @@ class Builder:
add=args.add_apt_source + args.add_build_apt_source, add=args.add_apt_source + args.add_build_apt_source,
replace=args.replace_apt_source + args.replace_build_apt_source, replace=args.replace_apt_source + args.replace_build_apt_source,
remove=args.remove_apt_source + args.remove_build_apt_source, remove=args.remove_apt_source + args.remove_build_apt_source,
for_build=True,
) )
self.final_apt_sources = self.generate_apt_sources( self.final_apt_sources = self.generate_apt_sources(
add=args.add_apt_source + args.add_final_apt_source, add=args.add_apt_source + args.add_final_apt_source,
replace=args.replace_apt_source + args.replace_final_apt_source, replace=args.replace_apt_source + args.replace_final_apt_source,
remove=args.remove_apt_source + args.remove_final_apt_source, remove=args.remove_apt_source + args.remove_final_apt_source,
for_build=False,
) )
for addition in args.add_apt_keyring: for addition in args.add_apt_keyring:
...@@ -515,6 +517,7 @@ class Builder: ...@@ -515,6 +517,7 @@ class Builder:
add=(), # type: typing.Sequence[str] add=(), # type: typing.Sequence[str]
replace=(), # type: typing.Sequence[str] replace=(), # type: typing.Sequence[str]
remove=(), # type: typing.Sequence[str] remove=(), # type: typing.Sequence[str]
for_build=False
): ):
# type: (...) -> typing.List[AptSource] # type: (...) -> typing.List[AptSource]
...@@ -550,6 +553,13 @@ class Builder: ...@@ -550,6 +553,13 @@ class Builder:
if replaced or source['label'] in remove: if replaced or source['label'] in remove:
continue continue
if for_build:
if not source.get('for_build', True):
continue
else:
if not source.get('for_final', True):
continue
if source.get('deb', True): if source.get('deb', True):
apt_sources.append(AptSource( apt_sources.append(AptSource(
'deb', uri, suite, 'deb', uri, suite,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment