[Zope-Checkins] CVS: Zope/inst - software_name.py:1.1.2.2

[Matt Behrens]

Update of /cvs-repository/Zope/inst
In directory cvs.zope.org:/tmp/cvs-serv30241/inst

Modified Files:
      Tag: zigg_unix-install-control-config-branch
	software_name.py 
Log Message:
portability and other fixes (testing on Solaris this morning) :-)


=== Zope/inst/software_name.py 1.1.2.1 => 1.1.2.2 ===
 	# Next see if what we have is a CVS branch.
 	cvs_tag_file = open('CVS/Tag', 'r')
-	cvs_tag = cvs_tag.readline() + '-'
+	cvs_tag = cvs_tag_file.readline()[1:].strip() + '-'
     except IOError:
 	try:
 	    # See if this is a CVS checkout at all.
 	    stat('CVS')
 	    cvs_tag = 'HEAD-'
 	except OSError:
-	    cvs_tag = 'noncvs-'
+	    cvs_tag = 'LOCAL-'
     name = cvs_tag + strftime('%Y_%m_%d', localtime())
 
 print name, released