Git commit 3966ef71a6c20ecca3fca3f3f18d1843feb3a732 by Patrick Spendrin. Committed on 31/08/2015 at 22:58. Pushed by sengels into branch 'master'. now also use PACKAGE_IGNORES to generate dynamic options M +4 -1 bin/emerge.py M +2 -2 bin/info.py M +2 -1 bin/options.py http://commits.kde.org/emerge/3966ef71a6c20ecca3fca3f3f18d1843feb3a732 diff --git a/bin/emerge.py b/bin/emerge.py index a38d343..5126343 100755 --- a/bin/emerge.py +++ b/bin/emerge.py @@ -278,8 +278,11 @@ def main( ): help =3D "probing: emerge will only look which fi= les it has to build according to the list of installed files and according = to the dependencies of the package." ) parser.add_argument( "--list-file", action =3D "store", help =3D "Build all packages from the csv file pr= ovided" ) + _def =3D emergeSettings.get( "General", "EMERGE_OPTIONS", "" ) + if _def =3D=3D "": _def =3D [] + else: _def =3D _def.split( ";" ) parser.add_argument( "--options", action =3D "append", - default =3D emergeSettings.get( "General", "EMERG= E_OPTIONS", "" ).split( ";" ), + default =3D _def, help =3D "Set emerge property from string . An example for is \"cmake.openIDE=3D1\" see options.py for more informa= tions." ) parser.add_argument( "-z", "--outDateVCS", action =3D "store_true", help =3D "if packages from version control system= sources are installed, it marks them as out of date and rebuilds them (tag= s are not marked as out of date)." ) diff --git a/bin/info.py b/bin/info.py index ce20a4b..47c3de8 100644 --- a/bin/info.py +++ b/bin/info.py @@ -18,10 +18,10 @@ import VersionInfo = class infoclass(object): """this module contains the information class""" - def __init__( self, parent, option_string=3DNone): + def __init__( self, parent, optionList=3D[]): ### package options self.parent =3D parent - self.options =3D Options(option_string) + self.options =3D Options(optionList) self.versionInfo =3D VersionInfo.VersionInfo(self) self.targets =3D OrderedDict() self.archiveNames =3D OrderedDict() diff --git a/bin/options.py b/bin/options.py index 68f0b27..1b41f70 100644 --- a/bin/options.py +++ b/bin/options.py @@ -300,7 +300,8 @@ class Options(object): #### end of user configurable part self.__verbose =3D False self.__errors =3D False - self.__readFromList(emergeSettings.get( "General", "EMERGE_OPTIONS= ", "")) + self.__readFromList(emergeSettings.get( "General", "EMERGE_OPTIONS= ", "").split(" ")) + self.__readFromList(["options.packages." + x.split('/')[-1] + "=3D= False" for x in emergeSettings.get( "Portage", "PACKAGE_IGNORES", "").split= (";")]) self.readFromEnv() self.__readFromList(optionslist) portage.PortageInstance.ignores.update(self.packages.getPackageIgn= ores())