Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
flatdeb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Frederic Danis
flatdeb
Commits
743a3f0d
Commit
743a3f0d
authored
May 08, 2019
by
Simon McVittie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow apt sources to be marked as only for the build or the final product
Signed-off-by:
Simon McVittie
<
smcv@collabora.com
>
parent
7a8219f8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
0 deletions
+10
-0
run.py
run.py
+10
-0
No files found.
run.py
View file @
743a3f0d
...
...
@@ -494,11 +494,13 @@ class Builder:
add
=
args
.
add_apt_source
+
args
.
add_build_apt_source
,
replace
=
args
.
replace_apt_source
+
args
.
replace_build_apt_source
,
remove
=
args
.
remove_apt_source
+
args
.
remove_build_apt_source
,
for_build
=
True
,
)
self
.
final_apt_sources
=
self
.
generate_apt_sources
(
add
=
args
.
add_apt_source
+
args
.
add_final_apt_source
,
replace
=
args
.
replace_apt_source
+
args
.
replace_final_apt_source
,
remove
=
args
.
remove_apt_source
+
args
.
remove_final_apt_source
,
for_build
=
False
,
)
for
addition
in
args
.
add_apt_keyring
:
...
...
@@ -515,6 +517,7 @@ class Builder:
add
=
(),
# type: typing.Sequence[str]
replace
=
(),
# type: typing.Sequence[str]
remove
=
(),
# type: typing.Sequence[str]
for_build
=
False
):
# type: (...) -> typing.List[AptSource]
...
...
@@ -550,6 +553,13 @@ class Builder:
if
replaced
or
source
[
'label'
]
in
remove
:
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
):
apt_sources
.
append
(
AptSource
(
'deb'
,
uri
,
suite
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment