[yast-commit] r40180 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/commandline.ycp src/product-creator.ycp

Author: jsuchome Date: Fri Aug 10 14:54:43 2007 New Revision: 40180 URL: http://svn.opensuse.org/viewcvs/yast?rev=40180&view=rev Log: - CLI option for gpg passphrase (daniel.rahn and lslezak, #287477) - 2.13.9 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/commandline.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/product-creator.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION?rev=40180&r1=40179&r2=40180&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Fri Aug 10 14:54:43 2007 @@ -1 +1 @@ -2.13.8 +2.13.9 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes?rev=40180&r1=40179&r2=40180&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Fri Aug 10 14:54:43 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 10 14:48:44 CEST 2007 - jsuchome@suse.cz + +- CLI option for gpg passphrase (daniel.rahn and lslezak, #287477) +- 2.13.9 + +------------------------------------------------------------------- Wed Aug 8 15:19:45 CEST 2007 - jsuchome@suse.cz - yet another fix for "Back" button behavior (#289524) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/commandline.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/commandline.ycp?rev=40180&r1=40179&r2=40180&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/commandline.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/commandline.ycp Fri Aug 10 14:54:43 2007 @@ -10,11 +10,32 @@ { import "CommandLine"; import "Progress"; - + import "ProductCreator"; textdomain "product-creator"; + + void ProcessConfigFileOption(map params) + { + if (haskey(params, "configfile")) + { + string new_config = params["configfile"]:""; + + if (new_config != nil && new_config != "") + { + y2milestone("Using config file: %1", new_config); + + // TODO FIXME: set the config file path in "initialize" handler, + // don't read the default config file if the "configfile" option is used + ProductCreator::ConfigFile = new_config; + ProductCreator::Read(); + } + } + } + boolean ListHandler(map params) { + ProcessConfigFileOption(params); + foreach(string name, map conf, ProductCreator::Configs, { CommandLine::Print(name); @@ -28,6 +49,8 @@ { y2milestone("CreateIsoHandler parameters: %1", params); + ProcessConfigFileOption(params); + string name = params["name"]:""; if (name != "") @@ -41,13 +64,16 @@ return false; } - string file = params["passphrase"]:""; + string file = params["passphrase_file"]:""; if (file != nil && file != "") { y2milestone("Reading passphrase from file %1...", file); ProductCreator::gpg_passphrase = (string)SCR::Read(.target.string, file); } + if (haskey (params, "passphrase")) + ProductCreator::gpg_passphrase = params["passphrase"]:""; + // disable the progress boolean progress = Progress::set(false); Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/product-creator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/product-creator.ycp?rev=40180&r1=40179&r2=40180&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/product-creator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/product-creator.ycp Fri Aug 10 14:54:43 2007 @@ -53,13 +53,24 @@ ], "passphrase" : $[ // translators: command line help text for the 'passhrase' option + "help" : _("GPG passhrase required for signing the source."), + "type" : "string" + ], + "passphrase_file" : $[ + // command line help text for the 'passhrase_file' option "help" : _("File with GPG passhrase required for signing the source"), "type" : "string" + ], + "configfile" : $[ + // cmd line help text for the 'configfile' option, %1 is a file name + "help" : sformat(_("Path to the configuration file (default is %1"), + ProductCreator::ConfigFile), + "type" : "string" ] ], "mappings" : $[ - "list" : [], - "create-iso" : ["name", "passphrase"], + "list" : ["configfile"], + "create-iso" : ["name", "passphrase", "passphrase_file", "configfile"], ] ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org