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

lua: use apk_dep_analyze 

and remove the now unused apk_dep_is_materialized_or_provided
which was superceded by apk_dep_analyze.
cute-signatures
Timo Teräs 2013-06-15 19:47:01 +03:00
parent ac0c7457c2
commit 5b02400b26
3 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/apk_package.h
View File

@ -138,7 +138,6 @@ int apk_sign_ctx_mpart_cb(void *ctx, int part, apk_blob_t blob);
void apk_dep_from_pkg(struct apk_dependency *dep, struct apk_database *db, void apk_dep_from_pkg(struct apk_dependency *dep, struct apk_database *db,
struct apk_package *pkg); struct apk_package *pkg);
int apk_dep_is_materialized(struct apk_dependency *dep, struct apk_package *pkg); int apk_dep_is_materialized(struct apk_dependency *dep, struct apk_package *pkg);
int apk_dep_is_materialized_or_provided(struct apk_dependency *dep, struct apk_package *pkg);
int apk_dep_is_provided(struct apk_dependency *dep, struct apk_provider *p); int apk_dep_is_provided(struct apk_dependency *dep, struct apk_provider *p);
int apk_dep_analyze(struct apk_dependency *dep, struct apk_package *pkg); int apk_dep_analyze(struct apk_dependency *dep, struct apk_package *pkg);
char *apk_dep_snprintf(char *buf, size_t n, struct apk_dependency *dep); char *apk_dep_snprintf(char *buf, size_t n, struct apk_dependency *dep);

5
src/lua-apk.c
View File

@ -226,10 +226,9 @@ static int Papk_exists(lua_State *L)
if (pkg == NULL) if (pkg == NULL)
goto ret_nil; goto ret_nil;
if (!apk_dep_is_materialized_or_provided(&dep, pkg)) if (apk_dep_analyze(&dep, pkg) & APK_DEP_SATISFIES)
goto ret_nil; return push_package(L, pkg);
return push_package(L, pkg);
ret_nil: ret_nil:
lua_pushnil(L); lua_pushnil(L);
return 1; return 1;

22
src/package.c
View File

@ -377,28 +377,6 @@ int apk_dep_is_materialized(struct apk_dependency *dep, struct apk_package *pkg)
return dep->conflict; return dep->conflict;
} }
int apk_dep_is_materialized_or_provided(struct apk_dependency *dep, struct apk_package *pkg)
{
int i;
if (pkg == NULL)
return dep->conflict;
if (dep->name == pkg->name)
return apk_dep_is_materialized(dep, pkg);
for (i = 0; i < pkg->provides->num; i++) {
struct apk_provider p;
if (pkg->provides->item[i].name != dep->name)
continue;
p = APK_PROVIDER_FROM_PROVIDES(pkg, &pkg->provides->item[i]);
return apk_dep_is_provided(dep, &p);
}
return dep->conflict;
}
int apk_dep_analyze(struct apk_dependency *dep, struct apk_package *pkg) int apk_dep_analyze(struct apk_dependency *dep, struct apk_package *pkg)
{ {
struct apk_dependency *p; struct apk_dependency *p;