Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.package
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Rafael Monnerat
slapos.package
Commits
c66df069
Commit
c66df069
authored
Feb 17, 2021
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
re6st: fix Debian build with recent obs-build
Also stop using deprecated TarFile.add's exclude parameter.
parent
558dcf28
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
obs/re6st/make.py
obs/re6st/make.py
+6
-4
No files found.
obs/re6st/make.py
View file @
c66df069
...
@@ -178,10 +178,10 @@ def tarball(task):
...
@@ -178,10 +178,10 @@ def tarball(task):
t
.
add
(
"re6stnet/daemon"
)
t
.
add
(
"re6stnet/daemon"
)
for
x
in
upstream
.
outputs
:
for
x
in
upstream
.
outputs
:
t
.
add
(
x
)
t
.
add
(
x
)
def
exclude
(
path
):
def
tar_filter
(
info
):
return
path
.
endswith
(
'/.git'
)
return
None
if
info
.
name
.
endswith
(
'/.git'
)
else
info
for
x
in
BUILD_KEEP
:
for
x
in
BUILD_KEEP
:
t
.
add
(
BUILD
+
"/"
+
x
,
exclude
=
exclude
)
t
.
add
(
BUILD
+
"/"
+
x
,
filter
=
tar_filter
)
@
task
(
sdist
,
"debian/changelog"
)
@
task
(
sdist
,
"debian/changelog"
)
def
dch
(
task
):
def
dch
(
task
):
...
@@ -210,7 +210,9 @@ def deb(task):
...
@@ -210,7 +210,9 @@ def deb(task):
# Unfortunately, OBS does not support symlinks.
# Unfortunately, OBS does not support symlinks.
with
make_tar_gz
(
task
.
outputs
[
0
],
mtime
,
dereference
=
True
)
as
t
:
with
make_tar_gz
(
task
.
outputs
[
0
],
mtime
,
dereference
=
True
)
as
t
:
added
=
glob
(
"debian/*"
)
added
=
glob
(
"debian/*"
)
t
.
add
(
"debian"
)
t
.
add
(
"debian"
,
filter
=
lambda
info
:
# https://github.com/openSUSE/obs-build/pull/646
None
if
info
.
name
==
"debian/source"
else
info
)
x
=
"debian/control"
x
=
"debian/control"
tarfile_addfileobj
(
t
,
x
,
patched_control
,
control
)
tarfile_addfileobj
(
t
,
x
,
patched_control
,
control
)
added
.
append
(
x
)
added
.
append
(
x
)
...
...
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