git://git.onelab.eu
/
sface.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting tag sface-0.9-8
[sface.git]
/
sface
/
config.py
diff --git
a/sface/config.py
b/sface/config.py
index
bf94cbc
..
b8b1872
100644
(file)
--- a/
sface/config.py
+++ b/
sface/config.py
@@
-1,7
+1,7
@@
# config for sface
# uses in this order
# command-line args
# config for sface
# uses in this order
# command-line args
-#
~/.sfi
/sfi_config
+#
<configdir>
/sfi_config
###
import os
###
import os
@@
-28,9
+28,8
@@
class Config:
]
def __init__ (self):
]
def __init__ (self):
- print 'WARNING - should pass config dir'
- self.dirname=os.path.expanduser("~/.sfi/")
- self.read_config()
+ # no need to do anything here, we need set_dirname later on
+ pass
def get_dirname (self):
return self.dirname
def get_dirname (self):
return self.dirname
@@
-180,26
+179,19
@@
class Config:
if value is not None:
setattr(self,field,getattr(optparse_options,field))
if value is not None:
setattr(self,field,getattr(optparse_options,field))
-# def setUser(self, user):
-# Config.SFI_USER = user
-#
-# # Should probably get authority from user record instead...
-# a = user.split('.')
-# Config.SFI_AUTH = '.'.join(a[:len(a)-1])
-
def fullpath (self, filename): return os.path.join(self.get_dirname(),filename)
def getSliceRSpecFile(self): return self.fullpath("%s.rspec" % self.getSlice())
def fullpath (self, filename): return os.path.join(self.get_dirname(),filename)
def getSliceRSpecFile(self): return self.fullpath("%s.rspec" % self.getSlice())
+ def getResourcesRSpecFile(self): return self.fullpath("resources.rspec")
+
def getSliceRecordFile(self): return self.fullpath ("%s.record" % self.getSlice())
def getSliceRecordFile(self): return self.fullpath ("%s.record" % self.getSlice())
+ def getUserRecordFile(self): return self.fullpath ("%s.record" % self.getUser())
+
def getAuthorityRecordFile(self): return self.fullpath ("%s/%s.record" % self.getAuthority())
def getAuthorityRecordFile(self): return self.fullpath ("%s/%s.record" % self.getAuthority())
- def getAuthorityListFile(self, i=None):
- if (i != None) and (i != 0):
- return self.fullpath ("%s_list.record.%d" % (self.getAuthority(),i))
- else:
- return self.fullpath ("%s_list.record" % self.getAuthority())
+ def getAuthorityListFile(self): return self.fullpath ("%s_list.xml" % self.getAuthority())
# configuration singleton
# configuration singleton