Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
apk-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sertonix
apk-tools
Commits
990941f6
Commit
990941f6
authored
11 months ago
by
Sertonix
Committed by
Timo Teräs
11 months ago
Browse files
Options
Downloads
Patches
Plain Diff
list: fix -P with filter
parent
d6d61fd9
No related branches found
No related tags found
No related merge requests found
Pipeline
#223124
skipped
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/app_list.c
+5
-5
5 additions, 5 deletions
src/app_list.c
with
5 additions
and
5 deletions
src/app_list.c
+
5
−
5
View file @
990941f6
...
...
@@ -118,7 +118,7 @@ static void print_manifest(const struct apk_package *pkg, const struct list_ctx
printf
(
"%s "
BLOB_FMT
"
\n
"
,
pkg
->
name
->
name
,
BLOB_PRINTF
(
*
pkg
->
version
));
}
static
void
filter_package
(
const
struct
apk_database
*
db
,
const
struct
apk_package
*
pkg
,
const
struct
list_ctx
*
ctx
)
static
void
filter_package
(
const
struct
apk_database
*
db
,
const
struct
apk_package
*
pkg
,
const
struct
list_ctx
*
ctx
,
const
struct
apk_name
*
name
)
{
if
(
ctx
->
match_origin
&&
!
origin_matches
(
ctx
,
pkg
))
return
;
...
...
@@ -135,6 +135,9 @@ static void filter_package(const struct apk_database *db, const struct apk_packa
if
(
ctx
->
upgradable
&&
!
is_upgradable
(
db
,
pkg
))
return
;
if
(
ctx
->
match_providers
)
printf
(
"<%s> "
,
name
->
name
);
if
(
ctx
->
manifest
)
print_manifest
(
pkg
,
ctx
);
else
...
...
@@ -149,10 +152,7 @@ static void iterate_providers(const struct apk_database *db, const struct apk_na
if
(
!
ctx
->
match_providers
&&
p
->
pkg
->
name
!=
name
)
continue
;
if
(
ctx
->
match_providers
)
printf
(
"<%s> "
,
name
->
name
);
filter_package
(
db
,
p
->
pkg
,
ctx
);
filter_package
(
db
,
p
->
pkg
,
ctx
,
name
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment