Quick fixes for trivial problems. _pre14

6 files changed, 40 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index cf99a7d..3b3c5c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for Portage; the Gentoo Linux ports system 
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.518 2004/01/12 07:44:44 carpaski Exp $
+# $Id: ChangeLog,v 1.519 2004/01/12 21:11:46 carpaski Exp $
+
+*portage-2.0.50_pre14 (11 Jan 2004): Quick Fixes -- ~arch version
+
+  12 Jan 2004; Nicholas Jones <carpaski@gentoo.org> emerge: Fix for
+  traceback on '-S'.
+
+  12 Jan 2004; Nicholas Jones <carpaski@gentoo.org> repoman: Fix for
+  traceback on --help.
+
+  12 Jan 2004; Nicholas Jones <carpaski@gentoo.org> sandbox: Fix for
+  sandboxpids.tmp file accesses.
+
+  12 Jan 2004; Nicholas Jones <carpaski@gentoo.org> portage.py: Sandbox, as
+  above. Catch invalid package names and print a sane message about it.
+
+*portage-2.0.50_pre13 (11 Jan 2004): Fixes
 
   11 Jan 2004; Nicholas Jones <carpaski@gentoo.org> cnf/*: Updated the
   Advanced masking section to aid the reduction of user complaints and
diff --git a/bin/emerge b/bin/emerge
index 22cb1c6..324afb1 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/emerge,v 1.247 2004/01/09 22:54:56 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/emerge,v 1.248 2004/01/12 21:11:46 carpaski Exp $
 
 import os,sys
 os.environ["PORTAGE_CALLER"]="emerge"
@@ -173,7 +173,7 @@ if ("buildpkg" in portage.features) or ("--buildpkgonly" in myopts):
 
 # Also allow -S to invoke search action (-sS)
 if ("--searchdesc" in myopts):
-	if myaction != "search":
+	if myaction and myaction != "search":
 		myfiles.append(myaction)
 	if "--search" not in myopts:
 		myopts.append("--search")
diff --git a/bin/repoman b/bin/repoman
index ca72152..eabb86c 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/repoman,v 1.46 2004/01/08 18:13:01 nakano Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/repoman,v 1.47 2004/01/12 21:11:46 carpaski Exp $
 
 # Next to do: dep syntax checking in mask files
 # Then, check to make sure deps are satisfiable (to avoid "can't find match for" problems)
@@ -58,6 +58,7 @@ optionshelp={
 "--help"   :"Show this screen",
 "--commitmsg"    :"Adds a commit message via the command line.",
 "--commitmsgfile":"Adds a commit message from a file given on the command line.",
+"--ignore-other-arches": "Instructs repoman to ignore arches that are not relevent to the committing arch. REPORT/FIX issues you work around.",
 "--verbose":"Displays every package name while checking",
 "--xmlparse":"Forces the metadata.xml parse check tobe carried out"
 }
diff --git a/pym/portage.py b/pym/portage.py
index b31081e..3c9df4d 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1,7 +1,7 @@
 # portage.py -- core Portage functionality
 # Copyright 1998-2003 Daniel Robbins, Gentoo Technologies, Inc.
 # Distributed under the GNU Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.371 2004/01/12 07:34:38 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.372 2004/01/12 21:11:46 carpaski Exp $
 
 VERSION="2.0.50_pre10"
 
@@ -1318,6 +1318,11 @@ def spawn(mystring,mysettings,debug=0,free=0,droppriv=0,fd_pipes=None):
 				os.setgroups([portage_gid])
 				os.setuid(portage_uid)
 				os.umask(002)
+				try:
+					os.chown("/tmp/sandboxpids.tmp",uid,portage_gid)
+					os.chmod("/tmp/sandboxpids.tmp",0664)
+				except:
+					pass
 			else:
 				writemsg("portage: Unable to drop root for "+str(mystring)+"\n")
 
@@ -3292,7 +3297,11 @@ def match_from_list(mydep,candidate_list):
 
 	elif operator in [">", ">=", "<", "<="]:
 		for x in candidate_list:
-			result = pkgcmp(pkgsplit(x), [cat+"/"+pkg,ver,rev])
+			try:
+				result = pkgcmp(pkgsplit(x), [cat+"/"+pkg,ver,rev])
+			except:
+				writemsg("\nInvalid package name: %s\n" % x)
+				sys.exit(73)
 			if result == None:
 				continue
 			elif operator == ">":
diff --git a/src/sandbox-1.1/sandbox.c b/src/sandbox-1.1/sandbox.c
index 56506fc..34daca7 100644
--- a/src/sandbox-1.1/sandbox.c
+++ b/src/sandbox-1.1/sandbox.c
@@ -11,7 +11,7 @@
 **    Copyright (C) 2001 Geert Bevin, Uwyn, http://www.uwyn.com
 **    Distributed under the terms of the GNU General Public License, v2 or later 
 **    Author : Geert Bevin <gbevin@uwyn.com>
-**  $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/sandbox.c,v 1.12 2003/10/12 22:36:58 carpaski Exp $
+**  $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/sandbox.c,v 1.13 2004/01/12 21:11:46 carpaski Exp $
 */
 
 #define _GNU_SOURCE
@@ -193,7 +193,7 @@ cleanup()
 			return;
 		}
 
-		pids_file = file_open(sandbox_pids_file, "r+", 0);
+		pids_file = file_open(sandbox_pids_file, "r+", 1, 0664);
 		if (-1 == pids_file) {
 			success = 0;
 			/* Nothing more to do here */
@@ -213,7 +213,7 @@ cleanup()
 			if (print_debug)
 				printf("Cleaning up /etc/ld.so.preload.\n");
 
-			preload_file = file_open("/etc/ld.so.preload", "r+", 0);
+			preload_file = file_open("/etc/ld.so.preload", "r+", 1, 0664);
 			if (-1 != preload_file) {
 				/* Load all the preload libraries into an array */
 				num_of_preloads = load_preload_libs(preload_file, &preload_array);
@@ -400,7 +400,7 @@ print_sandbox_log(char *sandbox_log)
 	long len = 0;
 	char *buffer = NULL;
 
-	sandbox_log_file = file_open(sandbox_log, "r", 0);
+	sandbox_log_file = file_open(sandbox_log, "r", 1, 0664);
 	if (-1 == sandbox_log_file)
 		return 0;
 
@@ -607,7 +607,7 @@ main(int argc, char **argv)
 
 		if (getuid() == 0) {
 			/* Our r+ also will create the file if it doesn't exist */
-			preload_file = file_open("/etc/ld.so.preload", "r+", 1, 0644);
+			preload_file = file_open("/etc/ld.so.preload", "r+", 1, 0664);
 			if (-1 == preload_file) {
 				preload_adaptable = 0;
 /*      exit(1);*/
@@ -799,7 +799,7 @@ main(int argc, char **argv)
 			success = 0;
 			fprintf(stderr, ">>> %s is not a regular file", sandbox_pids_file);
 		} else {
-			pids_file = file_open(sandbox_pids_file, "r+", 1, 0644);
+			pids_file = file_open(sandbox_pids_file, "r+", 1, 0664);
 			if (-1 == pids_file)
 				success = 0;
 		}
diff --git a/tarball.sh b/tarball.sh
index 2ad3c31..4ccbaa7 100755
--- a/tarball.sh
+++ b/tarball.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/Attic/tarball.sh,v 1.177 2003/12/21 08:03:26 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/Attic/tarball.sh,v 1.178 2004/01/12 21:11:46 carpaski Exp $
 
 if [ -z "$1" ]; then
 	echo
@@ -25,7 +25,7 @@ fi
 rm -rf ${DEST}
 install -d -m0755 ${DEST}
 #get any binaries out of the way
-cd src/sandbox
+cd src/sandbox-1.1
 make clean
 cd ../..
 for x in bin cnf man pym src