Gentoo Archives: gentoo-commits

From: "Ned Ludd (solar)" <solar@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-projects commit in portage-utils: qmerge.c
Date: Wed, 02 Mar 2011 03:51:14
Message-Id: 20110302035101.D79E820054@flycatcher.gentoo.org
1 solar 11/03/02 03:51:01
2
3 Modified: qmerge.c
4 Log:
5 fix unlink behavior
6
7 Revision Changes Path
8 1.105 portage-utils/qmerge.c
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?rev=1.105&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?rev=1.105&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?r1=1.104&r2=1.105
13
14 Index: qmerge.c
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v
17 retrieving revision 1.104
18 retrieving revision 1.105
19 diff -u -r1.104 -r1.105
20 --- qmerge.c 24 Feb 2011 01:29:27 -0000 1.104
21 +++ qmerge.c 2 Mar 2011 03:51:01 -0000 1.105
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.104 2011/02/24 01:29:27 vapier Exp $
27 + * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.105 2011/03/02 03:51:01 solar Exp $
28 *
29 * Copyright 2005-2010 Ned Ludd - <solar@g.o>
30 * Copyright 2005-2010 Mike Frysinger - <vapier@g.o>
31 @@ -55,7 +55,7 @@
32 COMMON_OPTS_HELP
33 };
34
35 -static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.104 2011/02/24 01:29:27 vapier Exp $";
36 +static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.105 2011/03/02 03:51:01 solar 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 @@ -919,7 +919,7 @@
41 /* move the local vdb copy to the final place */
42 interactive_rename("vdb", buf, pkg);
43
44 - snprintf(buf, sizeof(buf), BUSYBOX " %s.tar.bz2", pkg->PF);
45 + snprintf(buf, sizeof(buf), "%s.tar.bz2", pkg->PF);
46 unlink_q(buf);
47 xchdir(port_tmpdir);
48 rm_rf(pkg->PF);