jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

list: Detect orphaned packages correctly 

BIT(1) corresponds with decimal 2, which is the first available repository.

Before this fix, `apk list -O` would list every package installed from the
first available repository, which is the 'system' repository on most Adélie
Linux computers.

After this fix, `apk list -O` correctly lists only the packages which are
no longer available.
cute-signatures
A. Wilcox 2019-05-01 08:59:16 -05:00 committed by Timo Teräs
parent 44daf80873
commit 84941a5967
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/list.c
View File

@ -61,7 +61,7 @@ static int is_orphaned(const struct apk_name *name)
/* repo 1 is always installed-db, so if other bits are set it means the package is available somewhere
* (either cache or in a proper repo)
*/
return (repos & ~BIT(1)) == 0;
return (repos & ~BIT(APK_REPOSITORY_CACHED)) == 0;
}
/* returns the currently installed package if there is a newer package that satisfies `name` */
@ -144,7 +144,7 @@ static void filter_package(const struct apk_package *pkg, const struct list_ctx
if (ctx->orphaned && !is_orphaned(pkg->name))
return;
if (ctx->available && pkg->repos == BIT(1))
if (ctx->available && pkg->repos == BIT(APK_REPOSITORY_CACHED))
return;
if (ctx->upgradable && !is_upgradable(pkg->name, pkg))