[gentoo-commits] gentoo-projects commit in portage-utils: qmerge.c

["Ned Ludd (solar)" <solar@gentoo.org>]

solar       10/01/18 06:30:26

  Modified:             qmerge.c
  Log:
  - when DEFINED_PHASES exists no longer run postinst unless it is defined

Revision  Changes    Path
1.93                 portage-utils/qmerge.c

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/qmerge.c?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/qmerge.c?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/qmerge.c?r1=1.92&r2=1.93

Index: qmerge.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- qmerge.c	13 Jan 2010 19:16:22 -0000	1.92
+++ qmerge.c	18 Jan 2010 06:30:26 -0000	1.93
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2007 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.92 2010/01/13 19:16:22 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.93 2010/01/18 06:30:26 solar Exp $
  *
  * Copyright 2005-2007 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2007 Mike Frysinger  - <vapier@gentoo.org>
@@ -55,7 +55,7 @@
 	COMMON_OPTS_HELP
 };
 
-static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.92 2010/01/13 19:16:22 vapier Exp $";
+static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.93 2010/01/18 06:30:26 solar Exp $";
 #define qmerge_usage(ret) usage(ret, QMERGE_FLAGS, qmerge_long_opts, qmerge_opts_help, lookup_applet_idx("qmerge"))
 
 char search_pkgs = 0;
@@ -402,6 +402,18 @@
 	return c;
 }
 
+int has_postinst(char *vdbroot);
+int has_postinst(char *vdbroot) {
+	FILE *fp;
+	char buf[1024];
+	snprintf(buf, sizeof(buf), "%s/%s", vdbroot, "DEFINED_PHASES");
+	if ((fp = fopen(buf,  "r")) == NULL)
+		return 1;
+	fgets(buf, sizeof(buf), fp);
+	fclose(fp);
+	return ((strstr(buf, "postinst") == NULL) ? 0 : 2);
+}
+
 /* oh shit getting into pkg mgt here. FIXME: write a real dep resolver. */
 void pkg_merge(int level, depend_atom *atom, struct pkg_t *pkg)
 {
@@ -784,7 +796,7 @@
 	interactive_rename("vdb", buf, pkg);
 
 	/* run postinst on non embedded systems */
-	if (which("ebuild") != NULL) {
+	if ((which("ebuild") != NULL) && has_postinst(buf)) {
 		char *tbuf;
 		xasprintf(&tbuf, "ebuild %s/%s.ebuild postinst", buf, basename(buf));
 		xsystem(tbuf);