[patch] Same as first one except with diff -u instead of plain diff

portage-2.0.50_pre19-varexpand.patch (text/plain), 1.03 KB, created by Jason Stubbs (RETIRED) on 2004-01-24 22:32:50 UTC

--- /usr/lib/portage/pym/portage.py	2004-01-24 01:21:34.000000000 +0900
+++ portage.py	2004-01-25 15:12:43.232595816 +0900
@@ -983,22 +983,29 @@
 						continue
 			elif (mystring[pos]=="$") and (mystring[pos-1]!="\\"):
 				pos=pos+1
-				if (pos+1)>=len(mystring):
-					cexpand[mystring]=""
-					return ""
 				if mystring[pos]=="{":
 					pos=pos+1
-					terminus="}"
+					braced=True
 				else:
-					terminus=string.whitespace
+					braced=False
 				myvstart=pos
-				while mystring[pos] not in terminus:
+				validchars=string.ascii_letters+string.digits+"_"
+				while mystring[pos] in validchars:
 					if (pos+1)>=len(mystring):
-						cexpand[mystring]=""
-						return ""
+						if braced:
+							cexpand[mystring]=""
+							return ""
+						else:
+							pos=pos+1
+							break
 					pos=pos+1
 				myvarname=mystring[myvstart:pos]
-				pos=pos+1
+				if braced:
+					if mystring[pos]!="}":
+						cexpand[mystring]=""
+						return ""
+					else:
+						pos=pos+1
 				if len(myvarname)==0:
 					cexpand[mystring]=""
 					return ""