ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/CRAB/python/LFNBaseName.py

Comparing COMP/CRAB/python/LFNBaseName.py (file contents):
Revision 1.12 by afanfani, Thu Oct 2 12:54:51 2008 UTC vs.
Revision 1.14 by fanzago, Wed Oct 15 18:45:30 2008 UTC

#	Line 4 | Line 4 | _LFNBaseName_
4		"""
5
6		from crab_exceptions import *
7	<	from crab_util import runCommand
7	>	from crab_util import runCommand, UnixUserName
8		import common
9		import os, string, time
10		from ProdCommon.SiteDB.SiteDB import SiteDBJSON
#	Line 18 | Line 18 | def LFNBase(PrimaryDataset='',ProcessedD
18		lfnbase = os.path.join(lfnbase,"tmp")
19		if (PrimaryDataset == 'null'):
20		PrimaryDataset = ProcessedDataset
21	<	lfnbase = os.path.join(lfnbase, "user", getUserName(LocalUser=LocalUser), PrimaryDataset, ProcessedDataset )
21	>	#lfnbase = os.path.join(lfnbase, "user", getUserName(LocalUser=LocalUser), PrimaryDataset, ProcessedDataset )
22	>	### for tutorial
23	>	lfnbase = os.path.join(lfnbase, "user/test", getUserName(LocalUser=LocalUser), PrimaryDataset, ProcessedDataset )
24
25		return lfnbase
26
#	Line 26 | Line 28 | def getUnixUserName():
28		"""
29		extract username from whoami
30		"""
31	<	try:
30	<	UserName = runCommand("whoami")
31	<	UserName = string.strip(UserName)
32	<	except:
33	<	msg = "Error. Problem with whoami command"
34	<	raise CrabException(msg)
35	<	return UserName
31	>	return UnixUserName()
32
33		def getDN():
34		"""

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines