db: fix installation of apk v1 packages
parent
36f73847ee
commit
6967c28b96
|
@ -692,7 +692,7 @@ static int apk_db_install_archive_entry(struct apk_archive_entry *ae,
|
||||||
p += strlen(pkg->version) + 1;
|
p += strlen(pkg->version) + 1;
|
||||||
|
|
||||||
type = apk_script_type(p);
|
type = apk_script_type(p);
|
||||||
if (type != APK_SCRIPT_INVALID)
|
if (type == APK_SCRIPT_INVALID)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -703,7 +703,7 @@ static int apk_db_install_archive_entry(struct apk_archive_entry *ae,
|
||||||
|
|
||||||
if (type == APK_SCRIPT_GENERIC ||
|
if (type == APK_SCRIPT_GENERIC ||
|
||||||
type == ctx->script) {
|
type == ctx->script) {
|
||||||
r = apk_pkg_run_script(pkg, db->root_fd, type);
|
r = apk_pkg_run_script(pkg, db->root_fd, ctx->script);
|
||||||
if (r != 0)
|
if (r != 0)
|
||||||
apk_error("%s-%s: Failed to execute pre-install/upgrade script",
|
apk_error("%s-%s: Failed to execute pre-install/upgrade script",
|
||||||
pkg->name->name, pkg->version);
|
pkg->name->name, pkg->version);
|
||||||
|
|
|
@ -172,7 +172,7 @@ int apk_script_type(const char *name)
|
||||||
strcmp(script_types[i], name) == 0)
|
strcmp(script_types[i], name) == 0)
|
||||||
return i;
|
return i;
|
||||||
|
|
||||||
return -1;
|
return APK_SCRIPT_INVALID;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct read_info_ctx {
|
struct read_info_ctx {
|
||||||
|
|
Loading…
Reference in New Issue