From 224d0246bb59e5066de6693a18bf8654dafa135d Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 2 Jun 2014 00:52:37 +0200 Subject: libdpkg: Uppercase and namespace pkgeflag enum values --- src/archives.c | 4 ++-- src/cleanup.c | 14 +++++++------- src/configure.c | 2 +- src/enquiry.c | 4 ++-- src/remove.c | 2 +- src/unpack.c | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/archives.c b/src/archives.c index 6bd4e35da..6bc794783 100644 --- a/src/archives.c +++ b/src/archives.c @@ -1490,7 +1490,7 @@ void check_conflict(struct dependency *dep, struct pkginfo *pkg, if (!pdep && skip_due_to_hold(fixbyrm)) { pdep= &flagdeppossi; } - if (!pdep && (fixbyrm->eflag & eflag_reinstreq)) { + if (!pdep && (fixbyrm->eflag & PKG_EFLAG_REINSTREQ)) { if (fc_removereinstreq) { notice(_("package %s requires reinstallation, but will " "remove anyway as you requested"), @@ -1712,7 +1712,7 @@ wanttoinstall(struct pkginfo *pkg) } } - if (pkg->eflag & eflag_reinstreq) + if (pkg->eflag & PKG_EFLAG_REINSTREQ) return true; if (pkg->status < stat_unpacked) return true; diff --git a/src/cleanup.c b/src/cleanup.c index 3f7f09318..b4acb3e01 100644 --- a/src/cleanup.c +++ b/src/cleanup.c @@ -3,7 +3,7 @@ * cleanup.c - cleanup functions, used when we need to unwind * * Copyright © 1995 Ian Jackson - * Copyright © 2007-2012 Guillem Jover + * Copyright © 2007-2014 Guillem Jover * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -118,7 +118,7 @@ void cu_prermupgrade(int argc, void **argv) { maintscript_postinst(pkg, "abort-upgrade", versiondescribe(&pkg->available.version, vdew_nonambig), NULL); - pkg_clear_eflags(pkg, eflag_reinstreq); + pkg_clear_eflags(pkg, PKG_EFLAG_REINSTREQ); post_postinst_tasks(pkg, stat_installed); cleanup_pkg_failed--; } @@ -179,7 +179,7 @@ void cu_prerminfavour(int argc, void **argv) { versiondescribe(&infavour->available.version, vdew_nonambig), NULL); - pkg_clear_eflags(conflictor, eflag_reinstreq); + pkg_clear_eflags(conflictor, PKG_EFLAG_REINSTREQ); post_postinst_tasks(conflictor, stat_installed); cleanup_conflictor_failed--; } @@ -193,7 +193,7 @@ void cu_preinstverynew(int argc, void **argv) { maintscript_new(pkg, POSTRMFILE, "post-removal", cidir, cidirrest, "abort-install", NULL); pkg_set_status(pkg, stat_notinstalled); - pkg_clear_eflags(pkg, eflag_reinstreq); + pkg_clear_eflags(pkg, PKG_EFLAG_REINSTREQ); pkgbin_blank(&pkg->installed); modstatdb_note(pkg); cleanup_pkg_failed--; @@ -210,7 +210,7 @@ void cu_preinstnew(int argc, void **argv) { versiondescribe(&pkg->installed.version, vdew_nonambig), NULL); pkg_set_status(pkg, stat_configfiles); - pkg_clear_eflags(pkg, eflag_reinstreq); + pkg_clear_eflags(pkg, PKG_EFLAG_REINSTREQ); modstatdb_note(pkg); cleanup_pkg_failed--; } @@ -227,7 +227,7 @@ void cu_preinstupgrade(int argc, void **argv) { versiondescribe(&pkg->installed.version, vdew_nonambig), NULL); pkg_set_status(pkg, *oldstatusp); - pkg_clear_eflags(pkg, eflag_reinstreq); + pkg_clear_eflags(pkg, PKG_EFLAG_REINSTREQ); modstatdb_note(pkg); cleanup_pkg_failed--; } @@ -249,7 +249,7 @@ void cu_prermremove(int argc, void **argv) { if (cleanup_pkg_failed++) return; maintscript_postinst(pkg, "abort-remove", NULL); - pkg_clear_eflags(pkg, eflag_reinstreq); + pkg_clear_eflags(pkg, PKG_EFLAG_REINSTREQ); post_postinst_tasks(pkg, *oldpkgstatus); cleanup_pkg_failed--; } diff --git a/src/configure.c b/src/configure.c index d8d4f7391..722ee876f 100644 --- a/src/configure.c +++ b/src/configure.c @@ -635,7 +635,7 @@ deferred_configure(struct pkginfo *pkg) varbuf_destroy(&aemsgs); sincenothing = 0; - if (pkg->eflag & eflag_reinstreq) + if (pkg->eflag & PKG_EFLAG_REINSTREQ) forcibleerr(fc_removereinstreq, _("package is in a very bad inconsistent state; you should\n" " reinstall it before attempting configuration")); diff --git a/src/enquiry.c b/src/enquiry.c index 701d662a9..a47bfb110 100644 --- a/src/enquiry.c +++ b/src/enquiry.c @@ -59,13 +59,13 @@ struct audit_problem { static bool audit_reinstreq(struct pkginfo *pkg, const struct audit_problem *problem) { - return pkg->eflag & eflag_reinstreq; + return pkg->eflag & PKG_EFLAG_REINSTREQ; } static bool audit_status(struct pkginfo *pkg, const struct audit_problem *problem) { - if (pkg->eflag & eflag_reinstreq) + if (pkg->eflag & PKG_EFLAG_REINSTREQ) return false; return (int)pkg->status == problem->value.number; } diff --git a/src/remove.c b/src/remove.c index 17996c8ff..a52395a7b 100644 --- a/src/remove.c +++ b/src/remove.c @@ -153,7 +153,7 @@ void deferred_remove(struct pkginfo *pkg) { varbuf_destroy(&raemsgs); sincenothing= 0; - if (pkg->eflag & eflag_reinstreq) + if (pkg->eflag & PKG_EFLAG_REINSTREQ) forcibleerr(fc_removereinstreq, _("package is in a very bad inconsistent state; you should\n" " reinstall it before attempting a removal")); diff --git a/src/unpack.c b/src/unpack.c index b2d12f24e..9a614ceb9 100644 --- a/src/unpack.c +++ b/src/unpack.c @@ -709,7 +709,7 @@ void process_archive(const char *filename) { oldversionstatus == stat_triggersawaited || oldversionstatus == stat_triggerspending || oldversionstatus == stat_installed) { - pkg_set_eflags(pkg, eflag_reinstreq); + pkg_set_eflags(pkg, PKG_EFLAG_REINSTREQ); pkg_set_status(pkg, stat_halfconfigured); modstatdb_note(pkg); push_cleanup(cu_prermupgrade, ~ehflag_normaltidy, NULL, 0, 1, (void *)pkg); @@ -801,7 +801,7 @@ void process_archive(const char *filename) { modstatdb_note(conflictor); } - pkg_set_eflags(pkg, eflag_reinstreq); + pkg_set_eflags(pkg, PKG_EFLAG_REINSTREQ); if (pkg->status == stat_notinstalled) { pkg->installed.version= pkg->available.version; pkg->installed.multiarch = pkg->available.multiarch; -- cgit v1.2.3