| 1 |
vapier 13/04/29 23:03:31 |
| 2 |
|
| 3 |
Modified: qmerge.c |
| 4 |
Log: |
| 5 |
qmerge: create $ROOT when merging if it does not yet exist, and check the return value of merge_tree() |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.127 portage-utils/qmerge.c |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?rev=1.127&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?rev=1.127&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?r1=1.126&r2=1.127 |
| 13 |
|
| 14 |
Index: qmerge.c |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v |
| 17 |
retrieving revision 1.126 |
| 18 |
retrieving revision 1.127 |
| 19 |
diff -u -r1.126 -r1.127 |
| 20 |
--- qmerge.c 29 Apr 2013 16:30:22 -0000 1.126 |
| 21 |
+++ qmerge.c 29 Apr 2013 23:03:31 -0000 1.127 |
| 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.126 2013/04/29 16:30:22 vapier Exp $ |
| 27 |
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.127 2013/04/29 23:03:31 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.126 2013/04/29 16:30:22 vapier Exp $"; |
| 36 |
+static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.127 2013/04/29 23:03:31 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 |
@@ -854,17 +854,18 @@ |
| 41 |
return; |
| 42 |
|
| 43 |
/* Set up our temp dir to unpack this stuff */ |
| 44 |
- xasprintf(&p, "%s/qmerge/%s", port_tmpdir, pkg->PF); |
| 45 |
+ xasprintf(&p, "%s/qmerge/%s/%s", port_tmpdir, pkg->CATEGORY, pkg->PF); |
| 46 |
mkdir_p(p, 0755); |
| 47 |
xchdir(p); |
| 48 |
+ xasprintf(&D, "%s/image", p); |
| 49 |
+ xasprintf(&T, "%s/temp", p); |
| 50 |
free(p); |
| 51 |
|
| 52 |
/* Doesn't actually remove $PWD, just everything under it */ |
| 53 |
rm_rf("."); |
| 54 |
|
| 55 |
- xasprintf(&D, "%s/qmerge/%s/image", port_tmpdir, pkg->PF); |
| 56 |
- xasprintf(&T, "%s/qmerge/%s/temp", port_tmpdir, pkg->PF); |
| 57 |
mkdir("temp", 0755); |
| 58 |
+ mkdir_p(portroot, 0755); |
| 59 |
|
| 60 |
/* XXX: maybe some day we should have this step operate on the |
| 61 |
* tarball directly rather than unpacking it first. */ |
| 62 |
@@ -915,7 +916,8 @@ |
| 63 |
if ((contents = fopen("vdb/CONTENTS", "w")) == NULL) |
| 64 |
errf("come on wtf?"); |
| 65 |
objs = NULL; |
| 66 |
- merge_tree("image", portroot, contents, &objs, iargc, iargv); |
| 67 |
+ if (merge_tree("image", portroot, contents, &objs, iargc, iargv)) |
| 68 |
+ errp("failed to merge to %s", portroot); |
| 69 |
fclose(contents); |
| 70 |
|
| 71 |
freeargv(iargc, iargv); |
Archives