Author: jsuchome Date: Mon Apr 28 14:57:36 2008 New Revision: 47111 URL: http://svn.opensuse.org/viewcvs/yast?rev=47111&view=rev Log: - save list of products to $HOME if module is not called by root - added /etc/sysconfig/add-on-creator for storing default values - 2.16.10 Added: trunk/add-on-creator/agents/cfg_add-on-creator.scr trunk/add-on-creator/agents/sysconfig.add-on-creator Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/agents/Makefile.am trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp trunk/add-on-creator/yast2-add-on-creator.spec.in Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=47111&... ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Mon Apr 28 14:57:36 2008 @@ -1 +1 @@ -2.16.9 +2.16.10 Modified: trunk/add-on-creator/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/agents/Makefile.am... ============================================================================== --- trunk/add-on-creator/agents/Makefile.am (original) +++ trunk/add-on-creator/agents/Makefile.am Mon Apr 28 14:57:36 2008 @@ -6,4 +6,6 @@ scrconf_DATA = *.scr -EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) +fillup_DATA = sysconfig.add-on-creator + +EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) $(fillup_DATA) Added: trunk/add-on-creator/agents/cfg_add-on-creator.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/agents/cfg_add-on-... ============================================================================== --- trunk/add-on-creator/agents/cfg_add-on-creator.scr (added) +++ trunk/add-on-creator/agents/cfg_add-on-creator.scr Mon Apr 28 14:57:36 2008 @@ -0,0 +1,17 @@ +/** + * File: + * cfg_add-on-creator.scr + * Summary: + * SCR Agent for reading/writing /etc/sysconfig/add-on-creator + * using the sysconfig-agent + * + * $Id: cfg_add-on-creator.scr 13009 2003-12-10 13:59:07Z jsuchome $ + * + * Read/Sets the values defined in <tt>/etc/sysconfig/add-on-creator</tt> + * in an easy manner. + */ +.sysconfig.add-on-creator + +`ag_ini( + `SysConfigFile("/etc/sysconfig/add-on-creator") +) Added: trunk/add-on-creator/agents/sysconfig.add-on-creator URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/agents/sysconfig.a... ============================================================================== --- trunk/add-on-creator/agents/sysconfig.add-on-creator (added) +++ trunk/add-on-creator/agents/sysconfig.add-on-creator Mon Apr 28 14:57:36 2008 @@ -0,0 +1,9 @@ +## Path: System/Yast2/Add-On-Creator +## Description: YaST2 Add-On Creator +## Type: string +## Default: none +# +# Default value of 'VENDOR' key in the content file for new Add-On Products. +# +# +VENDOR="" Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add-... ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Mon Apr 28 14:57:36 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 28 14:26:15 CEST 2008 - jsuchome@suse.cz + +- save list of products to $HOME if module is not called by root +- added /etc/sysconfig/add-on-creator for storing default values +- 2.16.10 + +------------------------------------------------------------------- Fri Apr 25 10:06:08 CEST 2008 - jsuchome@suse.cz - fixed some widget layouts Modified: trunk/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.y... ============================================================================== --- trunk/add-on-creator/src/AddOnCreator.ycp (original) +++ trunk/add-on-creator/src/AddOnCreator.ycp Mon Apr 28 14:57:36 2008 @@ -848,6 +848,16 @@ gpg_keys = read_secret_keys (); + map out = (map) SCR::Execute (.target.bash_output, "/usr/bin/id --user"); + if (out["stdout"]:"" != "0\n" && out["stdout"]:"" != "") + { + // TODO use getenv builtin when it is available + out = (map) SCR::Execute (.target.bash_output, "echo $HOME"); + string home = deletechars (out["stdout"]:"", "\n"); + if (home != "" && home != nil) + add_on_products_file = home + "/add_on_products.ycp"; + } + // Read the info of configured AddOns if (FileUtils::Exists (add_on_products_file)) { @@ -879,6 +889,12 @@ } if (key == "DEFAULTBASE") content_descr[key,"value"] = Arch::architecture (); + string defval = (string)SCR::Read (add(.sysconfig.add-on-creator, key)); + if (defval != nil && defval != "") + { + y2milestone ("using default value for %1: %2", key, defval); + content_descr[key,"value"] = defval; + } i = i + 1; }); Modified: trunk/add-on-creator/yast2-add-on-creator.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/yast2-add-on-creat... ============================================================================== --- trunk/add-on-creator/yast2-add-on-creator.spec.in (original) +++ trunk/add-on-creator/yast2-add-on-creator.spec.in Mon Apr 28 14:57:36 2008 @@ -1,6 +1,7 @@ @HEADER-COMMENT@ @HEADER@ +PreReq: %fillup_prereq Requires: yast2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite @@ -19,6 +20,9 @@ @CLEAN@ +%post +%{fillup_only -n add-on-creator} + %files %defattr(-,root,root) %dir @yncludedir@/add-on-creator @@ -31,3 +35,4 @@ @scrconfdir@/*.scr @agentdir@/ag_* %doc @docdir@ +/var/adm/fillup-templates/sysconfig.add-on-creator -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org