Do not inherit unneeded objs from trans dictionary onto pkg's pkgdb dictionary.

NEWS

@@ -1,5 +1,9 @@
 xbps-0.18 (???):
 
+ * When registering a pkg to pkgdb make sure to remove unneeded meta objs
+   from its pkg dictionary. Also add a check to xbps-bin(8) to remove those
+   objects if found.
+
  * Improved finding and removing obsolete files after upgrading a package
    in a transaction. Any obsolete link (not just dangling links) and
    configuration files are now removed if they are obsoletes.

bin/xbps-bin/Makefile

@@ -7,7 +7,7 @@ OBJS += show-info-files.o util.o find-files.o
 OBJS += question.o fetch_cb.o state_cb.o
 OBJS += check.o check_pkg_automatic.o check_pkg_files.o
 OBJS += check_pkg_rundeps.o check_pkg_symlinks.o
-OBJS += check_pkg_requiredby.o
+OBJS += check_pkg_requiredby.o check_pkg_unneeded.o
 OBJS += show-orphans.o unpack_cb.o list.o
 MAN = $(BIN).8
 

bin/xbps-bin/check.c

@@ -163,6 +163,7 @@ do {								\
 	RUN_PKG_CHECK(xhp, rundeps, propsd, &pkgdb_update);
 	RUN_PKG_CHECK(xhp, requiredby, pkgd ? pkgd : opkgd, &pkgdb_update);
 	RUN_PKG_CHECK(xhp, autoinstall, pkgd ? pkgd : opkgd, &pkgdb_update);
+	RUN_PKG_CHECK(xhp, unneeded, pkgd ? pkgd : opkgd, &pkgdb_update);
 
 	if (flush && pkgdb_update) {
 		if (!xbps_pkgdb_replace_pkgd(xhp, opkgd, pkgname, false, true)) {

bin/xbps-bin/check_pkg_unneeded.c

@@ -0,0 +1,65 @@
+/*-
+ * Copyright (c) 2012 Juan Romero Pardines.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <assert.h>
+#include <unistd.h>
+#include <sys/param.h>
+
+#include <xbps_api.h>
+#include "defs.h"
+
+/*
+ * Checks package integrity of an installed package.
+ * The following task is accomplished in this file:
+ *
+ * 	o Check if pkg dictionary from pkgdb contains "unneeded" objects,
+ * 	  and remove them if that was true.
+ */
+int
+check_pkg_unneeded(struct xbps_handle *xhp,
+		   const char *pkgname,
+		   void *arg,
+		   bool *pkgdb_update)
+{
+	prop_dictionary_t pkgd = arg;
+
+	(void)pkgname;
+	(void)xhp;
+
+	if (prop_dictionary_get(pkgd, "remove-and-update")) {
+		*pkgdb_update = true;
+		prop_dictionary_remove(pkgd, "remove-and-update");
+	}
+	if (prop_dictionary_get(pkgd, "transaction")) {
+		*pkgdb_update = true;
+		prop_dictionary_remove(pkgd, "transaction");
+	}
+	return 0;
+}

bin/xbps-bin/defs.h

@@ -68,6 +68,7 @@ int	check_pkg_integrity_all(struct xbps_handle *);
 int check_pkg_##type (struct xbps_handle *, const char *, void *, bool *)
 
 CHECK_PKG_DECL(autoinstall);
+CHECK_PKG_DECL(unneeded);
 CHECK_PKG_DECL(files);
 CHECK_PKG_DECL(rundeps);
 CHECK_PKG_DECL(symlinks);

lib/package_register.c

@@ -156,6 +156,12 @@ xbps_register_pkg(struct xbps_handle *xhp, prop_dictionary_t pkgrd, bool flush)
 			goto out;
 		}
 	}
+	/*
+	 * Remove unneeded objs from pkg dictionary.
+	 */
+	prop_dictionary_remove(pkgd, "remove-and-update");
+	prop_dictionary_remove(pkgd, "transaction");
+
 	if (!xbps_pkgdb_replace_pkgd(xhp, pkgd, pkgname, false, flush)) {
 		xbps_dbg_printf(xhp,
 		    "%s: failed to replace pkgd dict for %s\n",