| 1 |
vapier 13/04/29 16:30:22 |
| 2 |
|
| 3 |
Modified: qmerge.c |
| 4 |
Log: |
| 5 |
qmerge: run pkg_pretend, set MERGE_TYPE var, and add a few more helper funcs |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.126 portage-utils/qmerge.c |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?rev=1.126&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?rev=1.126&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?r1=1.125&r2=1.126 |
| 13 |
|
| 14 |
Index: qmerge.c |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v |
| 17 |
retrieving revision 1.125 |
| 18 |
retrieving revision 1.126 |
| 19 |
diff -u -r1.125 -r1.126 |
| 20 |
--- qmerge.c 29 Apr 2013 16:18:34 -0000 1.125 |
| 21 |
+++ qmerge.c 29 Apr 2013 16:30:22 -0000 1.126 |
| 22 |
@@ -1,7 +1,7 @@ |
| 23 |
/* |
| 24 |
* Copyright 2005-2010 Gentoo Foundation |
| 25 |
* Distributed under the terms of the GNU General Public License v2 |
| 26 |
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.125 2013/04/29 16:18:34 vapier Exp $ |
| 27 |
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.126 2013/04/29 16:30:22 vapier Exp $ |
| 28 |
* |
| 29 |
* Copyright 2005-2010 Ned Ludd - <solar@g.o> |
| 30 |
* Copyright 2005-2010 Mike Frysinger - <vapier@g.o> |
| 31 |
@@ -65,7 +65,7 @@ |
| 32 |
COMMON_OPTS_HELP |
| 33 |
}; |
| 34 |
|
| 35 |
-static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.125 2013/04/29 16:18:34 vapier Exp $"; |
| 36 |
+static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.126 2013/04/29 16:30:22 vapier Exp $"; |
| 37 |
#define qmerge_usage(ret) usage(ret, QMERGE_FLAGS, qmerge_long_opts, qmerge_opts_help, lookup_applet_idx("qmerge")) |
| 38 |
|
| 39 |
char search_pkgs = 0; |
| 40 |
@@ -432,13 +432,17 @@ |
| 41 |
"debug-print-section() { :; }\n" |
| 42 |
/* Not quite right */ |
| 43 |
"has_version() { qlist -ICq -e '$1' >/dev/null; }\n" |
| 44 |
+ /* best_version() */ |
| 45 |
"use() { useq \"$@\"; }\n" |
| 46 |
- "useq() { hasq $1 $USE; }\n" |
| 47 |
+ "usex() { useq \"$1\" && echo \"${2-yes}$4\" || echo \"${3-no}$5\"; }\n" |
| 48 |
+ "useq() { hasq \"$1\" $USE; }\n" |
| 49 |
"has() { hasq \"$@\"; }\n" |
| 50 |
"hasq() { local h=$1; shift; case \" $* \" in *\" $h \"*) return 0;; *) return 1;; esac; }\n" |
| 51 |
+ "hasv() { hasq \"$@\" && echo \"$1\"; }\n" |
| 52 |
"elog() { printf ' * %%b\\n' \"$*\"; }\n" |
| 53 |
"einfo() { elog \"$@\"; }\n" |
| 54 |
"ewarn() { elog \"$@\"; }\n" |
| 55 |
+ "eqawarn() { elog \"QA: \"\"$@\"; }\n" |
| 56 |
"eerror() { elog \"$@\"; }\n" |
| 57 |
"die() { eerror \"$@\"; exit 1; }\n" |
| 58 |
"ebegin() { printf ' * %%b ...' \"$*\"; }\n" |
| 59 |
@@ -448,6 +452,7 @@ |
| 60 |
/* Load the main env */ |
| 61 |
". '%1$s/environment'\n" |
| 62 |
/* Reload env vars that matter to us */ |
| 63 |
+ "MERGE_TYPE=binary\n" |
| 64 |
"ROOT='%4$s'\n" |
| 65 |
"EROOT=\"${EPREFIX%%/}/${ROOT#/}\"\n" |
| 66 |
"D='%5$s'\n" |
| 67 |
@@ -881,6 +886,7 @@ |
| 68 |
fflush(stdout); |
| 69 |
|
| 70 |
eat_file("vdb/DEFINED_PHASES", phases, sizeof(phases)); |
| 71 |
+ pkg_run_func("vdb", phases, "pkg_pretend", D, T); |
| 72 |
pkg_run_func("vdb", phases, "pkg_setup", D, T); |
| 73 |
pkg_run_func("vdb", phases, "pkg_preinst", D, T); |
Archives