- YaST Commits

[yast-commit] r38065 - in /branches/tmp/sh/mod-ui/core/libyui: Makefile.am testsuite/
by sh-sh-sh＠svn.opensuse.org 21 May '07

21 May '07

Author: sh-sh-sh Date: Mon May 21 15:54:59 2007 New Revision: 38065 URL: http://svn.opensuse.org/viewcvs/yast?rev=38065&view=rev Log: Got rid of utterly useless testsuite Removed: branches/tmp/sh/mod-ui/core/libyui/testsuite/ Modified: branches/tmp/sh/mod-ui/core/libyui/Makefile.am Modified: branches/tmp/sh/mod-ui/core/libyui/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/Mak… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/Makefile.am (original) +++ branches/tmp/sh/mod-ui/core/libyui/Makefile.am Mon May 21 15:54:59 2007 @@ -2,4 +2,4 @@ # Makefile.am for core/libyui # -SUBDIRS = src doc testsuite +SUBDIRS = src doc -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38064 - in /branches/tmp/lslezak/cd-creator: package/yast2-product-creator.changes src/wizards.ycp
by lslezak＠svn.opensuse.org 21 May '07

21 May '07

Author: lslezak Date: Mon May 21 14:37:22 2007 New Revision: 38064 URL: http://svn.opensuse.org/viewcvs/yast?rev=38064&view=rev Log: - fixed workflow: display the GPG dialog also if an AutoYast profile is used for package selection (#275913) Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes branches/tmp/lslezak/cd-creator/src/wizards.ycp Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/packag… ============================================================================== --- branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes (original) +++ branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes Mon May 21 14:37:22 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 21 14:34:30 CEST 2007 - lslezak(a)suse.cz + +- fixed workflow: display the GPG dialog also if an AutoYast + profile is used for package selection (#275913) + +------------------------------------------------------------------- Mon May 21 11:10:16 CEST 2007 - lslezak(a)suse.cz - always store isolinux.cfg into the config file, even if there Modified: branches/tmp/lslezak/cd-creator/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/wi… ============================================================================== --- branches/tmp/lslezak/cd-creator/src/wizards.ycp (original) +++ branches/tmp/lslezak/cd-creator/src/wizards.ycp Mon May 21 14:37:22 2007 @@ -57,7 +57,7 @@ "isolinux": $[ `abort : `abort, `next : "packagemanager", - `autoyast : "summary" + `autoyast : "gpgkey" ], "packagemanager": $[ `abort : `abort, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38063 - in /trunk/network: package/yast2-network.changes src/modules/DNS.ycp
by kmachalkova＠svn.opensuse.org 21 May '07

21 May '07

Author: kmachalkova Date: Mon May 21 14:01:40 2007 New Revision: 38063 URL: http://svn.opensuse.org/viewcvs/yast?rev=38063&view=rev Log: IsHostLocal test extended to include also hostname and/or IP set by DHCP (#163170) Modified: trunk/network/package/yast2-network.changes trunk/network/src/modules/DNS.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon May 21 14:01:40 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 21 13:57:47 CEST 2007 - kmachalkova(a)suse.cz + +- IsHostLocal test extended to include also hostname and/or IP set by + DHCP (#163170) + +------------------------------------------------------------------- Mon May 14 10:52:43 CEST 2007 - kmachalkova(a)suse.cz - Correct comparison of installed and downloaded release notes Modified: trunk/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DNS.ycp?rev=… ============================================================================== --- trunk/network/src/modules/DNS.ycp (original) +++ trunk/network/src/modules/DNS.ycp Mon May 21 14:01:40 2007 @@ -88,6 +88,26 @@ return true; } +/* + * Get current hostname and IP Address + * if these are set by DHCP + * @return map with ip, hostname_short and hostname_fq keys + */ +global define map <string, string> GetDHCPHostnameIP () { + map <string, string> ret = $[]; + + map output = (map) SCR::Execute(.target.bash_output, "hostname -i"); + ret["ip"] = deletechars(output["stdout"]:"", " \n"); + + output = (map) SCR::Execute(.target.bash_output, "hostname"); + ret["hostname_short"] = deletechars(output["stdout"]:"", " \n"); + + output = (map) SCR::Execute(.target.bash_output, "hostname -f"); + ret["hostname_fq"] = deletechars(output["stdout"]:"", " \n"); + + return ret; +} + /** * resolver config file location */ @@ -405,10 +425,17 @@ */ global define boolean IsHostLocal (string check_host) { Read (); + NetworkDevices::Read (); + map <string, string> dhcp_data = $[]; + + if ( (size( NetworkDevices::Locate("BOOTPROTO", "dhcp") ) > 0) || + NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false == true ) { + dhcp_data = GetDHCPHostnameIP(); + y2milestone("Got DHCP-configured data: %1", dhcp_data); + } /* FIXME: May not work properly in following situations: - multiple addresses per interface - aliases in /etc/hosts - - hostname or IP address is set through DHCP - IPADDR=IP/24 */ @@ -422,8 +449,9 @@ // IPv4 address if (IP::Check4 (check_host)) { - NetworkDevices::Read (); - return 0 != size (NetworkDevices::Locate ("IPADDR", check_host)); + if ( (size (NetworkDevices::Locate ("IPADDR", check_host)) > 0) + || dhcp_data["ip"]:"" == check_host) + return true; } // IPv6 address else if (IP::Check6 (check_host)) @@ -433,12 +461,16 @@ // short hostname else if (findfirstof (check_host, ".") == nil) { - return tolower (check_host) == tolower (hostname); + if ( (tolower (check_host) == tolower (hostname)) + || dhcp_data["hostname_short"]:"" == check_host) + return true; } // fully qualified hostname else { - return tolower (check_host) == tolower (hostname + "." + domain); + if ( (tolower (check_host) == tolower (hostname + "." + domain)) + || dhcp_data["hostname_fq"]:"" == check_host ) + return true; } return false; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38062 - /tags/stable-2_15_8/add-on-creator/
by jsuchome＠svn.opensuse.org 21 May '07

21 May '07

Author: jsuchome Date: Mon May 21 13:34:12 2007 New Revision: 38062 URL: http://svn.opensuse.org/viewcvs/yast?rev=38062&view=rev Log: Created tag stable-2_15_8 for add-on-creator Added: tags/stable-2_15_8/add-on-creator/ - copied from r38061, trunk/add-on-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38061 - in /trunk/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 21 May '07

21 May '07

Author: jsuchome Date: Mon May 21 13:34:03 2007 New Revision: 38061 URL: http://svn.opensuse.org/viewcvs/yast?rev=38061&view=rev Log: - fixed signing content file (#275883) - fixed exporting gpg key (#275900) - 2.15.8 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=38061… ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Mon May 21 13:34:03 2007 @@ -1 +1 @@ -2.15.7 +2.15.8 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 May 21 13:34:03 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 21 13:21:12 CEST 2007 - jsuchome(a)suse.cz + +- fixed signing content file (#275883) +- fixed exporting gpg key (#275900) +- 2.15.8 + +------------------------------------------------------------------- Thu May 17 16:42:33 CEST 2007 - jsuchome(a)suse.cz - clear pattern data map before importing next one (#273528) Modified: trunk/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.… ============================================================================== --- trunk/add-on-creator/src/AddOnCreator.ycp (original) +++ trunk/add-on-creator/src/AddOnCreator.ycp Mon May 21 13:34:03 2007 @@ -1631,28 +1631,12 @@ string pw_path = tmpdir + "/pw"; SCR::Write (.target.string, pw_path, passphrase); - // sign the content file - SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", base_path)); - out = (map) SCR::Execute (.target.bash_output, sformat(" - gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", - local_key, base_path, pw_path) - ); - if (out["exit"]:0 != 0) - { - if (Mode::commandline ()) - Report::Error (out["stderr"]:""); - else - // error message - Popup::ErrorDetails (_("Signing of the product failed."), out["stderr"]:""); - return false; - } - // export the key: command = sformat ("gpg --export -a %1 > '%2/gpg-pubkey-%3-%1.asc'", local_key, base_path, big_key); SCR::Execute (.target.bash, command, $["LANG" : "C"]); - // than, make a sha1 sum of that key (content file is modified last time) + // make a sha1 sum of that key (content file is modified last time) out = (map) SCR::Execute (.target.bash_output, sformat ("cd '%1'; ls -A1 gpg-pubkey*", base_path)); @@ -1666,8 +1650,24 @@ SCR::Execute (.target.bash, command, $["LANG" : "C"]); }); + // sign the content file + SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", base_path)); + out = (map) SCR::Execute (.target.bash_output, sformat(" + gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", + local_key, base_path, pw_path) + ); + if (out["exit"]:0 != 0) + { + if (Mode::commandline ()) + Report::Error (out["stderr"]:""); + else + // error message + Popup::ErrorDetails (_("Signing of the product failed."), out["stderr"]:""); + return false; + } + SCR::Execute (.target.bash, - sformat("gpg --export -a -u %1 > '%2/content.key'",local_key, base_path)); + sformat("gpg --export -a %1 > '%2/content.key'",local_key, base_path)); // sign products file string products_path = full_media_paths[0]:"" + "/products"; @@ -1678,7 +1678,7 @@ sformat("gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2' < %3", local_key, products_path, pw_path)); SCR::Execute (.target.bash, - sformat("gpg --export -a -u %1 > '%2.key'", local_key,products_path)); + sformat("gpg --export -a %1 > '%2.key'", local_key,products_path)); } SCR::Execute (.target.remove, pw_path); return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38060 - /tags/branch-SLE-10-SP1-2_13_19/add-on-creator/
by jsuchome＠svn.opensuse.org 21 May '07

21 May '07

Author: jsuchome Date: Mon May 21 13:24:48 2007 New Revision: 38060 URL: http://svn.opensuse.org/viewcvs/yast?rev=38060&view=rev Log: Created tag branch-SLE-10-SP1-2_13_19 for add-on-creator Added: tags/branch-SLE-10-SP1-2_13_19/add-on-creator/ - copied from r38059, branches/SuSE-SLE-10-SP1-Branch/add-on-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38059 - in /branches/SuSE-SLE-10-SP1-Branch/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 21 May '07

21 May '07

Author: jsuchome Date: Mon May 21 13:24:40 2007 New Revision: 38059 URL: http://svn.opensuse.org/viewcvs/yast?rev=38059&view=rev Log: - fixed signing content file (#275883) - fixed exporting gpg key (#275900) - 2.13.19 Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION Mon May 21 13:24:40 2007 @@ -1 +1 @@ -2.13.18 +2.13.19 Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes Mon May 21 13:24:40 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 21 10:46:20 CEST 2007 - jsuchome(a)suse.cz + +- fixed signing content file (#275883) +- fixed exporting gpg key (#275900) +- 2.13.19 + +------------------------------------------------------------------- Thu May 17 16:44:59 CEST 2007 - jsuchome(a)suse.cz - clear pattern data map before importing next one (#273528) Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp Mon May 21 13:24:40 2007 @@ -1631,28 +1631,12 @@ string pw_path = tmpdir + "/pw"; SCR::Write (.target.string, pw_path, passphrase); - // sign the content file - SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", base_path)); - out = (map) SCR::Execute (.target.bash_output, sformat(" - gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", - local_key, base_path, pw_path) - ); - if (out["exit"]:0 != 0) - { - if (Mode::commandline ()) - Report::Error (out["stderr"]:""); - else - // error message - Popup::ErrorDetails (_("Signing of the product failed."), out["stderr"]:""); - return false; - } - // export the key: command = sformat ("gpg --export -a %1 > '%2/gpg-pubkey-%3-%1.asc'", local_key, base_path, big_key); SCR::Execute (.target.bash, command, $["LANG" : "C"]); - // than, make a sha1 sum of that key (content file is modified last time) + // make a sha1 sum of that key (content file is modified last time) out = (map) SCR::Execute (.target.bash_output, sformat ("cd '%1'; ls -A1 gpg-pubkey*", base_path)); @@ -1666,8 +1650,24 @@ SCR::Execute (.target.bash, command, $["LANG" : "C"]); }); + // sign the content file + SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", base_path)); + out = (map) SCR::Execute (.target.bash_output, sformat(" + gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", + local_key, base_path, pw_path) + ); + if (out["exit"]:0 != 0) + { + if (Mode::commandline ()) + Report::Error (out["stderr"]:""); + else + // error message + Popup::ErrorDetails (_("Signing of the product failed."), out["stderr"]:""); + return false; + } + SCR::Execute (.target.bash, - sformat("gpg --export -a -u %1 > '%2/content.key'",local_key, base_path)); + sformat("gpg --export -a %1 > '%2/content.key'",local_key, base_path)); // sign products file string products_path = full_media_paths[0]:"" + "/products"; @@ -1678,7 +1678,7 @@ sformat("gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2' < %3", local_key, products_path, pw_path)); SCR::Execute (.target.bash, - sformat("gpg --export -a -u %1 > '%2.key'", local_key,products_path)); + sformat("gpg --export -a %1 > '%2.key'", local_key,products_path)); } SCR::Execute (.target.remove, pw_path); return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38058 - in /trunk/packager: package/yast2-packager.changes src/modules/SourceDialogs.ycp
by jsrain＠svn.opensuse.org 21 May '07

21 May '07

Author: jsrain Date: Mon May 21 13:01:51 2007 New Revision: 38058 URL: http://svn.opensuse.org/viewcvs/yast?rev=38058&view=rev Log: check if host name specified is valid (#232887) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SourceDialogs.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon May 21 13:01:51 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 21 13:59:38 CEST 2007 - jsrain(a)suse.cz + +- check if host name specified is valid (#232887) + +------------------------------------------------------------------- Thu May 17 12:29:56 CEST 2007 - locilka(a)suse.cz - Sort licenses alphabetically using an lsort instead of common Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialo… ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Mon May 21 13:01:51 2007 @@ -27,6 +27,7 @@ import "Report"; import "NetworkPopup"; import "String"; +import "Hostname"; // common functions / data @@ -827,6 +828,19 @@ } } +boolean ServerValidate (string key, map event) { + string host = NormalizeHost ((string)UI::QueryWidget (`id (`server), `Value)); + if (! Hostname::CheckFQ (host)) + { + UI::SetFocus (`server); + Popup::Message (Hostname::ValidFQ ()); + return false; + } + + return true; +} + + /** * Store function of a widget * @param key string widget key @@ -898,6 +912,13 @@ directory = directory + ";workgroup=" + workgroup; } parsed["path"] = directory; + + // set HTTP/HTTPS port + if (type == `http || type == `https) + { + parsed["port"] = (string)UI::QueryWidget(`id(`port), `Value); + } + y2milestone("Entered URL: %1", parsed); _url = URL::Build (parsed); y2milestone("URL::Build: %1", _url); @@ -908,11 +929,6 @@ _url = PosprocessISOURL (_url); } - // set HTTP/HTTPS port - if (type == `http || type == `https) - { - parsed["port"] = (string)UI::QueryWidget(`id(`port), `Value); - } } @@ -935,6 +951,8 @@ `ReplacePoint (`id (`server_rp), `Empty ()) ), "init" : ServerInit, + "validate_type" : `function, + "validate_function" : ServerValidate, "store" : ServerStore, "handle" : ServerHandle, // help text - server dialog -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38057 - in /trunk/yast2: library/cwm/src/CWMServiceStart.ycp package/yast2.changes
by jsrain＠svn.opensuse.org 21 May '07

21 May '07

Author: jsrain Date: Mon May 21 12:42:18 2007 New Revision: 38057 URL: http://svn.opensuse.org/viewcvs/yast?rev=38057&view=rev Log: do not check UI mode when enabling the 'Use LDAP' widget in service dialog (#274649) Modified: trunk/yast2/library/cwm/src/CWMServiceStart.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/cwm/src/CWMServiceStart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/src/CWMService… ============================================================================== --- trunk/yast2/library/cwm/src/CWMServiceStart.ycp (original) +++ trunk/yast2/library/cwm/src/CWMServiceStart.ycp Mon May 21 12:42:18 2007 @@ -679,8 +679,7 @@ ); if (! (haskey (settings, "get_use_ldap") - && haskey (settings, "set_use_ldap") - && ProductFeatures::GetFeature ("globals", "ui_mode") != "simple")) + && haskey (settings, "set_use_ldap"))) { ldap_settings = `VBox (); help = ""; Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon May 21 12:42:18 2007 @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Mon May 21 10:45:35 CEST 2007 - jsrain(a)suse.cz +Mon May 21 13:39:58 CEST 2007 - jsrain(a)suse.cz - fixed chrp board detection (PPC) (#273606) +- do not check UI mode when enabling the 'Use LDAP' widget in + service dialog (#274649) ------------------------------------------------------------------- Thu May 17 17:57:17 CEST 2007 - lslezak(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38056 - in /branches/tmp/lslezak/cd-creator: package/yast2-product-creator.changes src/ProductCreator.ycp src/dialogs.ycp
by lslezak＠svn.opensuse.org 21 May '07

21 May '07

Author: lslezak Date: Mon May 21 11:31:46 2007 New Revision: 38056 URL: http://svn.opensuse.org/viewcvs/yast?rev=38056&view=rev Log: - always store isolinux.cfg into the config file, even if there is no change (#275914) Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp branches/tmp/lslezak/cd-creator/src/dialogs.ycp Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/packag… ============================================================================== --- branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes (original) +++ branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes Mon May 21 11:31:46 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 21 11:10:16 CEST 2007 - lslezak(a)suse.cz + +- always store isolinux.cfg into the config file, even if there + is no change (#275914) + +------------------------------------------------------------------- Wed May 16 14:23:57 CEST 2007 - jsuchome(a)suse.cz - added widgets for 'root' and 'config' directory editation Modified: branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/Pr… ============================================================================== --- branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp (original) +++ branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp Mon May 21 11:31:46 2007 @@ -1719,11 +1719,6 @@ : sformat("%1/boot/loader/isolinux.cfg", skel_root); SCR::Write(.target.string, fname, Config["bootconfig"]:"" ); - /* - string cpCmd = sformat("cp %1/product-creator/isolinux.cfg %2/boot/loader", - Directory::datadir, skel_root); - SCR::Execute (.target.bash, cpCmd); - */ } cpCmd = (Config["code10"]:false) ? sformat("cp %1/product-creator/message %2/boot/%3/loader", Directory::datadir, skel_root, arch) Modified: branches/tmp/lslezak/cd-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/di… ============================================================================== --- branches/tmp/lslezak/cd-creator/src/dialogs.ycp (original) +++ branches/tmp/lslezak/cd-creator/src/dialogs.ycp Mon May 21 11:31:46 2007 @@ -649,11 +649,8 @@ } else if(ret == `next) { string isolinux_new = (string)UI::QueryWidget(`id(`isolinux), `Value); - if (isolinux_new != isolinux) - { - ProductCreator::Config["bootconfig"] = isolinux_new; - } - + ProductCreator::Config["bootconfig"] = isolinux_new; + y2milestone("Isolinux config: %1", isolinux_new); break; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0