Entropy: move entropy.conf parsing into SystemSettings Singleton
class. As announced, SystemSettings is going to host all the Entropy global variables. With this big commit, proxy config (and the rest of entropy.conf data) has been moved under SystemSettings['system']
This commit is contained in:
+3
-1
@@ -31,10 +31,12 @@ from entropy.i18n import _
|
||||
import entropy.tools as entropyTools
|
||||
from entropy.output import *
|
||||
from entropy.const import *
|
||||
from entropy.core import SystemSettings
|
||||
SysSettings = SystemSettings()
|
||||
|
||||
myopts = [
|
||||
None,
|
||||
(0," ~ "+etpConst['systemname']+" ~ "+sys.argv[0]+" ~ ",1,'Entropy Package Manager - (C) %s' % (entropyTools.get_year(),) ),
|
||||
(0," ~ "+SysSettings['system']['name']+" ~ "+sys.argv[0]+" ~ ",1,'Entropy Package Manager - (C) %s' % (entropyTools.get_year(),) ),
|
||||
None,
|
||||
(0,_('Basic Options'),0,None),
|
||||
None,
|
||||
|
||||
+3
-1
@@ -32,10 +32,12 @@ from entropy.i18n import _
|
||||
import entropy.tools as entropyTools
|
||||
from entropy.output import *
|
||||
from entropy.const import *
|
||||
from entropy.core import SystemSettings
|
||||
SysSettings = SystemSettings()
|
||||
|
||||
myopts = [
|
||||
None,
|
||||
(0," ~ "+etpConst['systemname']+" ~ "+sys.argv[0]+" ~ ",1,'Entropy Package Manager - (C) %s' % (entropyTools.get_year(),) ),
|
||||
(0," ~ "+SysSettings['system']['name']+" ~ "+sys.argv[0]+" ~ ",1,'Entropy Package Manager - (C) %s' % (entropyTools.get_year(),) ),
|
||||
None,
|
||||
(0,_('Basic Options'),0,None),
|
||||
None,
|
||||
|
||||
Reference in New Issue
Block a user