From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1IkjRE-0004R0-7K for garchives@archives.gentoo.org; Wed, 24 Oct 2007 16:50:36 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.14.1/8.14.0) with SMTP id l9OGoYtn006448; Wed, 24 Oct 2007 16:50:34 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by robin.gentoo.org (8.14.1/8.14.0) with ESMTP id l9OGoX6V006443 for ; Wed, 24 Oct 2007 16:50:33 GMT Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id EB99364A1C for ; Wed, 24 Oct 2007 16:50:32 +0000 (UTC) Received: from solar by stork.gentoo.org with local (Exim 4.60) (envelope-from ) id 1IkjRA-0002iw-09 for gentoo-commits@lists.gentoo.org; Wed, 24 Oct 2007 16:50:32 +0000 From: "Ned Ludd (solar)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, solar@gentoo.org Subject: [gentoo-commits] gentoo-projects commit in portage-utils: qmerge.c X-VCS-Repository: gentoo-projects X-VCS-Files: qmerge.c X-VCS-Directories: portage-utils X-VCS-Committer: solar X-VCS-Committer-Name: Ned Ludd Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: Sender: Ned Ludd Date: Wed, 24 Oct 2007 16:50:32 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@gentoo.org X-Archives-Salt: 48ddc646-0f97-4430-959d-70b6e1cd9091 X-Archives-Hash: bab53eecb6eef647137e1f4f40c0b5f9 solar 07/10/24 16:50:31 Modified: qmerge.c Log: - qmerge updates that I needed to commit for a while Revision Changes Path 1.77 portage-utils/qmerge.c file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/qmerge.c?rev=1.77&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/qmerge.c?rev=1.77&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/qmerge.c?r1=1.76&r2=1.77 Index: qmerge.c =================================================================== RCS file: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- qmerge.c 4 Jun 2007 16:53:53 -0000 1.76 +++ qmerge.c 24 Oct 2007 16:50:31 -0000 1.77 @@ -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.76 2007/06/04 16:53:53 solar Exp $ + * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.77 2007/10/24 16:50:31 solar Exp $ * * Copyright 2005-2007 Ned Ludd - * Copyright 2005-2007 Mike Frysinger - @@ -24,6 +24,8 @@ /* #define BUSYBOX "/bin/busybox" */ #define BUSYBOX "" +int old_repo = 0; + #define QMERGE_FLAGS "fFsKUpuyO5" COMMON_FLAGS static struct option const qmerge_long_opts[] = { {"fetch", no_argument, NULL, 'f'}, @@ -53,7 +55,7 @@ COMMON_OPTS_HELP }; -static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.76 2007/06/04 16:53:53 solar Exp $"; +static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.77 2007/10/24 16:50:31 solar Exp $"; #define qmerge_usage(ret) usage(ret, QMERGE_FLAGS, qmerge_long_opts, qmerge_opts_help, lookup_applet_idx("qmerge")) char search_pkgs = 0; @@ -238,7 +240,7 @@ char *p; /* if defined(EBUG) this spits out incorrect versions. */ - snprintf(buf, sizeof(buf), "qlist -CIev %s%s%s 2>/dev/null | tr '\n' ' '", + snprintf(buf, sizeof(buf), "qlist -CIev '%s%s%s' 2>/dev/null | tr '\n' ' '", (CATEGORY != NULL ? CATEGORY : ""), (CATEGORY != NULL ? "/" : ""), PN); if ((fp = popen(buf, "r")) == NULL) @@ -361,10 +363,7 @@ case OLDER: c = 'D'; break; default: c = '?'; break; } - if (subatom->PR_int) - snprintf(buf, sizeof(buf), "%s-r%i", subatom->PV, subatom->PR_int); - else - snprintf(buf, sizeof(buf), "%s", subatom->PV); + strncpy(buf, subatom->P, sizeof(buf)); snprintf(install_ver, sizeof(install_ver), "[%s%s%s] ", DKBLUE, buf, NORM); atom_implode(subatom); } @@ -586,7 +585,7 @@ if (strcmp(pkg->SLOT, slot) != 0) u = 0; } - if (u) pkg_unmerge(atom->CATEGORY, basename(pf)); + if (u) pkg_unmerge(atom->CATEGORY, basename(pf)); /* We need to really set this unmerge pending after we look at contents of the new pkg */ break; default: warn("no idea how we reached here."); @@ -765,7 +764,7 @@ mkdirhier(buf, 0755); strncat(buf, pkg->PF, sizeof(buf)); - /* FIXME */ + /* FIXME */ /* move unmerging to around here ? */ /* not perfect when a version is already installed */ if (access(buf, X_OK) == 0) { char buf2[sizeof(buf)] = ""; @@ -1043,13 +1042,15 @@ /* fetch the package */ /* Check CATEGORY first */ - snprintf(buf, sizeof(buf), "%s/%s.tbz2", atom->CATEGORY, pkg->PF); - fetch(str, buf); - + if (!old_repo) { + snprintf(buf, sizeof(buf), "%s/%s.tbz2", atom->CATEGORY, pkg->PF); + fetch(str, buf); + } snprintf(buf, sizeof(buf), "%s/%s/%s.tbz2", pkgdir, atom->CATEGORY, pkg->PF); if (access(buf, R_OK) != 0) { snprintf(buf, sizeof(buf), "%s.tbz2", pkg->PF); fetch(str, buf); + old_repo = 1; } /* verify the pkg exists now. unlink if zero bytes */ @@ -1455,6 +1456,7 @@ queue *world = NULL; char *fname = (char *) "/var/lib/portage/world"; + /* FIXME: Add ROOT= checks here */ if ((fp = fopen(fname, "r")) == NULL) { warn("fopen(\"%s\", \"r\"); = -1 (%s)", fname, strerror(errno)); return NULL; -- gentoo-commits@gentoo.org mailing list