tab/space problemleri

This commit is contained in:
S.Çağlar Onur
2005-06-21 14:47:32 +00:00
parent 3abf40413c
commit bfaebf4187
2 changed files with 37 additions and 37 deletions
+32 -32
View File
@@ -40,48 +40,48 @@ class Constants:
class Context(object): class Context(object):
"""Config/Context Singleton""" """Config/Context Singleton"""
class __impl: class __impl:
def __init__(self): def __init__(self):
self.const = Constants() self.const = Constants()
# self.c.destdir = '' # install default to root by default # self.c.destdir = '' # install default to root by default
self.destdir = './tmp' # only for ALPHA self.destdir = './tmp' # only for ALPHA
# the idea is that destdir can be set with --destdir=... # the idea is that destdir can be set with --destdir=...
def setSpecFile(self, pspecfile): def setSpecFile(self, pspecfile):
self.pspecfile = pspecfile self.pspecfile = pspecfile
spec = SpecFile() spec = SpecFile()
spec.read(pspecfile) spec.read(pspecfile)
spec.verify() # check pspec integrity spec.verify() # check pspec integrity
self.spec = spec self.spec = spec
# directory accessor functions # directory accessor functions
# here is how it goes # here is how it goes
# x_dir: system wide directory for storing info type x # x_dir: system wide directory for storing info type x
# pkg_x_dir: per package directory for storing info type x # pkg_x_dir: per package directory for storing info type x
def lib_dir(self): def lib_dir(self):
return self.destdir + self.const.lib_dir_suffix return self.destdir + self.const.lib_dir_suffix
def db_dir(self): def db_dir(self):
return self.destdir + self.const.db_dir_suffix return self.destdir + self.const.db_dir_suffix
def archives_dir(self): def archives_dir(self):
return self.destdir + self.const.archives_dir_suffix return self.destdir + self.const.archives_dir_suffix
def tmp_dir(self): def tmp_dir(self):
return self.destdir + self.const.tmp_dir_suffix return self.destdir + self.const.tmp_dir_suffix
def pkg_dir(self): def pkg_dir(self):
packageDir = self.spec.source.name + '-' \ packageDir = self.spec.source.name + '-' \
+ self.spec.source.version + '-' + self.spec.source.release + self.spec.source.version + '-' + self.spec.source.release
return self.destdir + self.const.tmp_dir_suffix \ return self.destdir + self.const.tmp_dir_suffix \
+ '/' + packageDir + '/' + packageDir
def pkg_work_dir(self): def pkg_work_dir(self):
return self.pkg_dir() + self.const.work_dir_suffix return self.pkg_dir() + self.const.work_dir_suffix
def pkg_install_dir(self): def pkg_install_dir(self):
return self.pkg_dir() + self.const.install_dir_suffix return self.pkg_dir() + self.const.install_dir_suffix
__instance = __impl() __instance = __impl()
+5 -5
View File
@@ -46,9 +46,9 @@ class SourceArchive:
if percentHook: if percentHook:
fetch.percentHook = percentHook fetch.percentHook = percentHook
fetch.fetch() fetch.fetch()
# FIXME: What a ugly hack! We should really find a cleaner way for output. # FIXME: What a ugly hack! We should really find a cleaner way for output.
if percentHook: if percentHook:
ui.info('\n') ui.info('\n')
pass pass