Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
atools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
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
Leo
atools
Commits
ef9de567
Commit
ef9de567
authored
May 26, 2019
by
Leo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove tab chars before sorting packages
parent
c43ee7c9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
8 deletions
+12
-8
NEWS
NEWS
+4
-0
aports-lint
aports-lint
+8
-8
No files found.
NEWS
View file @
ef9de567
CHANGES with 11.2:
- make duplicate and upper package detection remove tab chars ('\t') before sorting
CHANGES with 11.1:
- Include NEWS from version 10 to 11
...
...
aports-lint
View file @
ef9de567
...
...
@@ -65,7 +65,7 @@ find_dupe() {
upper_repo_depends
()
{
[
"
$SKIP_UPPER_REPO_DEPENDS
"
]
&&
return
0
printf
"%s
\n
"
"
$depends
"
|
tr
" "
"
\n
"
|
sort
-u
|
while
read
-r
pkg
;
do
printf
"%s
\n
"
"
$depends
"
|
tr
" "
"
\n
"
|
tr
-d
"
\t
"
|
sort
-u
|
while
read
-r
pkg
;
do
for
p
in
$(
find_repo
"
$pkg
"
"
$_repo
"
)
;
do
printf
"
$apkbuild
:: depends '
$pkg
' is in upper repo '
$p
'
\n
"
done
...
...
@@ -74,7 +74,7 @@ upper_repo_depends() {
duplicate_depends
()
{
[
"
$SKIP_DUPLICATE_DEPENDS
"
]
&&
return
0
printf
"%s
\n
"
"
$depends
"
|
tr
" "
"
\n
"
|
sort
|
uniq
-d
|
while
read
-r
dup
;
do
printf
"%s
\n
"
"
$depends
"
|
tr
" "
"
\n
"
|
tr
-d
"
\t
"
|
sort
|
uniq
-d
|
while
read
-r
dup
;
do
[
-z
"
$dup
"
]
&&
continue
printf
"
$apkbuild
:: duplicate '
$dup
' in depends
\n
"
done
...
...
@@ -82,7 +82,7 @@ duplicate_depends() {
upper_repo_makedepends
()
{
[
"
$SKIP_UPPER_REPO_MAKEDEPENDS
"
]
&&
return
0
printf
"%s
\n
"
"
$makedepends
"
|
tr
" "
"
\n
"
|
sort
-u
|
while
read
-r
pkg
;
do
printf
"%s
\n
"
"
$makedepends
"
|
tr
" "
"
\n
"
|
tr
-d
"
\t
"
|
sort
-u
|
while
read
-r
pkg
;
do
for
p
in
$(
find_repo
"
$pkg
"
"
$_repo
"
)
;
do
printf
"
$apkbuild
:: makedepends '
$pkg
' is in upper repo '
$p
'
\n
"
done
...
...
@@ -91,7 +91,7 @@ upper_repo_makedepends() {
duplicate_makedepends
()
{
[
"
$SKIP_DUPLICATE_MAKEDEPENDS
"
]
&&
return
0
printf
"%s
\n
"
"
$makedepends
"
|
tr
" "
"
\n
"
|
sort
|
uniq
-d
|
while
read
-r
dup
;
do
printf
"%s
\n
"
"
$makedepends
"
|
tr
" "
"
\n
"
|
tr
-d
"
\t
"
|
sort
|
uniq
-d
|
while
read
-r
dup
;
do
[
-z
"
$dup
"
]
&&
continue
printf
"
$apkbuild
:: duplicate '
$dup
' in makedepends
\n
"
done
...
...
@@ -99,7 +99,7 @@ duplicate_makedepends() {
upper_repo_checkdepends
()
{
[
"
$SKIP_UPPER_REPO_CHECKDEPENDS
"
]
&&
return
0
printf
"%s
\n
"
"
$checkdepends
"
|
tr
" "
"
\n
"
|
sort
-u
|
while
read
-r
pkg
;
do
printf
"%s
\n
"
"
$checkdepends
"
|
tr
" "
"
\n
"
|
tr
-d
"
\t
"
|
sort
-u
|
while
read
-r
pkg
;
do
for
p
in
$(
find_repo
"
$pkg
"
"
$_repo
"
)
;
do
printf
"
$apkbuild
:: checkdepends '
$pkg
' is in upper repo '
$p
'
\n
"
done
...
...
@@ -108,7 +108,7 @@ upper_repo_checkdepends() {
duplicate_checkdepends
()
{
[
"
$SKIP_DUPLICATE_CHECKDEPENDS
"
]
&&
return
0
printf
"%s
\n
"
"
$checkdepends
"
|
tr
" "
"
\n
"
|
sort
|
uniq
-d
|
while
read
-r
dup
;
do
printf
"%s
\n
"
"
$checkdepends
"
|
tr
" "
"
\n
"
|
tr
-d
"
\t
"
|
sort
|
uniq
-d
|
while
read
-r
dup
;
do
[
-z
"
$dup
"
]
&&
continue
printf
"
$apkbuild
:: duplicate '
$dup
' in checkdepends
\n
"
done
...
...
@@ -139,8 +139,8 @@ pkgname_dirname_mismatch() {
depends_makedepends_checkdepends_overlap
()
{
[
"
$SKIP_DEPENDS_MAKEDEPENDS_CHECKDEPENDS_OVERLAP
"
]
&&
return
0
local
_mkdeps _ckdeps d
_mkdeps
=
"
$(
echo
$makedepends
|
tr
" "
"
\\
n"
|
sort
-u
)
"
_ckdeps
=
"
$(
echo
$checkdepends
|
tr
" "
"
\\
n"
|
sort
-u
)
"
_mkdeps
=
"
$(
echo
$makedepends
|
tr
" "
"
\\
n"
|
tr
-d
"
\t
"
|
sort
-u
)
"
_ckdeps
=
"
$(
echo
$checkdepends
|
tr
" "
"
\\
n"
|
tr
-d
"
\t
"
|
sort
-u
)
"
[
-z
"
$_mkdeps
"
]
&&
[
-z
"
$_ckdeps
"
]
&&
return
0
for
d
in
$depends
;
do
if
printf
"%s
\\
n"
"
$_mkdeps
"
|
grep
-q
"^
$d
$"
;
then
...
...
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