Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
chromebrew
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
chromebrew
Commits
141a6d54
Commit
141a6d54
authored
Apr 10, 2021
by
Ed Reel
Committed by
GitHub
Apr 11, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add check for conflicts with other installed files during a build (#5588)
parent
70e71086
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
1 deletion
+24
-1
crew
crew
+23
-0
lib/const.rb
lib/const.rb
+1
-1
No files found.
crew
View file @
141a6d54
...
@@ -690,6 +690,29 @@ def prepare_package (destdir)
...
@@ -690,6 +690,29 @@ def prepare_package (destdir)
system
'find . -type l >> ../filelist'
system
'find . -type l >> ../filelist'
system
'cut -c2- ../filelist > filelist'
system
'cut -c2- ../filelist > filelist'
#
check
for
conflicts
with
other
installed
files
conflicts
=
[]
Dir
[
CREW_META_PATH
+
'*.filelist'
].
each
do
|
packageList
|
packageName
=
File
.
basename
packageList
,
'.filelist'
File
.
readlines
(
packageList
).
each
do
|
line
|
File
.
readlines
(
'filelist'
).
each
do
|
item
|
if
line
==
item
&&
packageName
!= @pkg.name
conflicts
<<
[
packageName
,
item
.
chomp
]
end
end
end
end
unless
conflicts
.
empty
?
puts
"Unable to complete this build since there is a conflict with the same file in another package."
.
lightred
pp
=
''
conflicts
.
each
do
|
p
,
f
|
puts
"
\n
#{p} package conflicts below:"
.
lightred
if
p
!= pp
puts
f
.
lightred
pp
=
p
end
abort
end
#
create
directory
list
#
create
directory
list
system
'find . -type d > ../dlist'
system
'find . -type d > ../dlist'
system
'cut -c2- ../dlist > dlistcut'
system
'cut -c2- ../dlist > dlistcut'
...
...
lib/const.rb
View file @
141a6d54
# Defines common constants used in different parts of crew
# Defines common constants used in different parts of crew
CREW_VERSION
=
'1.7.2
2
'
CREW_VERSION
=
'1.7.2
3
'
ARCH_ACTUAL
=
`uname -m`
.
strip
ARCH_ACTUAL
=
`uname -m`
.
strip
# This helps with virtualized builds on aarch64 machines
# This helps with virtualized builds on aarch64 machines
...
...
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