September 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r40907 - /tags/stable-2_15_79/
by locilka＠svn.opensuse.org 14 Sep '07

14 Sep '07

Author: locilka Date: Fri Sep 14 10:24:11 2007 New Revision: 40907 URL: http://svn.opensuse.org/viewcvs/yast?rev=40907&view=rev Log: Created tag stable-2_15_79 Added: tags/stable-2_15_79/ -- 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] r40906 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/ProductLicense.ycp yast2-packager.spec.in
by locilka＠svn.opensuse.org 14 Sep '07

14 Sep '07

Author: locilka Date: Fri Sep 14 10:23:45 2007 New Revision: 40906 URL: http://svn.opensuse.org/viewcvs/yast?rev=40906&view=rev Log: - Fixed behavior when the same licence had to be accepted several times - for every single repository added. Now, the same licence has to be accepted only once (during one YaST run) (#305503). - Adjusted RPM dependency (md5sum binary) (#305503). - 2.15.79 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/ProductLicense.ycp trunk/packager/yast2-packager.spec.in Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=40906&r1=40… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Fri Sep 14 10:23:45 2007 @@ -1 +1 @@ -2.15.78 +2.15.79 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 Fri Sep 14 10:23:45 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Sep 14 09:12:23 CEST 2007 - locilka(a)suse.cz + +- Fixed behavior when the same licence had to be accepted several + times - for every single repository added. Now, the same licence + has to be accepted only once (during one YaST run) (#305503). +- Adjusted RPM dependency (md5sum binary) (#305503). +- 2.15.79 + +------------------------------------------------------------------- Wed Sep 12 16:16:08 CEST 2007 - locilka(a)suse.cz - Fixed evaluation of $short_language localization key in online Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLice… ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Fri Sep 14 10:23:45 2007 @@ -30,9 +30,88 @@ textdomain "packager"; +// list of already accepted licenses +list <string> already_accepted_licenses = []; + +/** + * Creates a unique identification from filename + * (MD5sum + file size) + * + * @param string filename + * @return string unique ID + */ +string GetLicenseIdentString (string filename) { + if (! FileUtils::Exists (filename)) { + y2error ("License '%1' doesn't exist", filename); + return nil; + } + + string ret = ""; + + string cmd = sformat ("md5sum '%1'", String::Quote (filename)); + map cmd_out = (map) SCR::Execute (.target.bash_output, cmd); + + if (cmd_out["exit"]:-1 != 0) { + y2error ("Command >%1< returned %2", cmd, cmd_out); + return nil; + } + + string filemd5 = cmd_out["stdout"]:""; + if (regexpmatch (filemd5, "[^ \t]+[ \t]+.*$")) { + // Format: '19ea7ea41de37314f71c6849ddd259d5 /the/file' + filemd5 = regexpsub (filemd5, "^([^ \t]+)[ \t]+.*$", "\\1"); + } else { + y2warning ("Strange md5out: '%1'", filemd5); + } + + ret = sformat("%1-%2", filemd5, FileUtils::GetSize (filename)); + + y2milestone ("License ident for '%1' is '%2'", filename, ret); + + return ret; +} + +/** + * Checks whether the license (file) has been already accepted + * + * @param string filename + * @return boolean whether the license has been accepted before + */ +boolean IsLicenseAlreadyAccepted (string license_ident) { + if (license_ident == nil || license_ident == "") { + y2error ("Wrong license ID '%1'", license_ident); + return false; + } + + return contains (already_accepted_licenses, license_ident); +} + +/** + * Sets that the license (file) has been already accepted + * + * @param string filename + */ +void LicenseHasBeenAccepted (string license_ident) { + if (license_ident == nil || license_ident == "") { + y2error ("Wrong license ID '%1'", license_ident); + return; + } + + y2milestone ("Adding License ID '%1' as already accepted", license_ident); + already_accepted_licenses = add (already_accepted_licenses, license_ident); +} + +string WhichLicenceFile (string license_language, map <string, string> & licenses) { + string license_file = licenses[license_language]:""; + + y2milestone ("Using license file: %1", license_file); + + return license_file; +} + term GetLicenseContent (string lic_lang, map <string, string> & licenses) { - string license_file = licenses[lic_lang]:""; - y2milestone ("Using license file: %1", license_file); + string license_file = WhichLicenceFile (lic_lang, licenses); + string license_text = (string) SCR::Read(.target.string, license_file); if (license_text == nil) { @@ -534,6 +613,35 @@ return `auto; } + // Check whether such license hasn't been already accepted + // Bugzilla #305503 + string license_ident_lang = nil; + + // We need to store the oroginal -- not localized license ID (if possible) + foreach (string check_this, ["", "en", lic_lang], { + if (contains (available_langs, check_this)) { + license_ident_lang = license_ident_lang; + y2milestone ("Using localization '%1' (for license ID)", license_ident_lang); + break; + } + }); + + // fallback + if (license_ident_lang == nil) license_ident_lang = lic_lang; + + string base_license = WhichLicenceFile (license_ident_lang, licenses); + string license_ident = GetLicenseIdentString (base_license); + + // defined, properly ($md5sum(32)-(1)$size(1..n)) + if (license_ident != nil && size (license_ident) > 33 && IsLicenseAlreadyAccepted (license_ident)) { + y2milestone ("License has been already accepted"); + + CleanUpLicense (tmpdir); + return `accepted; + } else { + y2milestone ("License needs to be accepted"); + } + // bugzilla #303922 // src_id == nil (the initial product license) if (src_id != nil) { @@ -687,7 +795,12 @@ } } - CleanUpLicense(tmpdir); + if (ret == `accepted && license_ident != nil) { + // store already accepted license ID + LicenseHasBeenAccepted (license_ident); + } + + CleanUpLicense (tmpdir); // bugzilla #303922 if (src_id != nil) { Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?… ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Fri Sep 14 10:23:45 2007 @@ -26,6 +26,9 @@ # XML module (inst_productsources.ycp) Requires: yast2-xml +# Bugzilla #305503 - storing/checking MD5 of licenses +Requires: /usr/bin/md5sum + # setenv() builtin Conflicts: yast2-core < 2.15.10 -- 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] r40905 - /tags/stable-2_15_21/add-on-creator/
by jsuchome＠svn.opensuse.org 14 Sep '07

14 Sep '07

Author: jsuchome Date: Fri Sep 14 10:03:13 2007 New Revision: 40905 URL: http://svn.opensuse.org/viewcvs/yast?rev=40905&view=rev Log: Created tag stable-2_15_21 for add-on-creator Added: tags/stable-2_15_21/add-on-creator/ - copied from r40904, 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] r40904 - in /trunk/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp src/add-on-creator.ycp src/complex.ycp src/patterns.ycp
by jsuchome＠svn.opensuse.org 14 Sep '07

14 Sep '07

Author: jsuchome Date: Fri Sep 14 10:02:58 2007 New Revision: 40904 URL: http://svn.opensuse.org/viewcvs/yast?rev=40904&view=rev Log: - enable deleting of pattern keys (#297195) - enable reading compressed metadata files - 2.15.21 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp trunk/add-on-creator/src/add-on-creator.ycp trunk/add-on-creator/src/complex.ycp trunk/add-on-creator/src/patterns.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=40904… ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Fri Sep 14 10:02:58 2007 @@ -1 +1 @@ -2.15.20 +2.15.21 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 Fri Sep 14 10:02:58 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Sep 14 08:39:09 CEST 2007 - jsuchome(a)suse.cz + +- enable deleting of pattern keys (#297195) +- enable reading compressed metadata files +- 2.15.21 + +------------------------------------------------------------------- Thu Aug 23 14:34:17 CEST 2007 - jsuchome(a)suse.cz - copy packages with different architectures to correct 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 Fri Sep 14 10:02:58 2007 @@ -652,6 +652,14 @@ return modified; } +boolean gzip_is_installed = nil; + +boolean gzip_installed () { + if (gzip_is_installed == nil) + gzip_is_installed = Package::Installed ("gzip"); + return gzip_is_installed; +} + map lang_codes = $[ "languages" : nil, "with_country" : nil, @@ -823,11 +831,33 @@ return ret; } +/** + * Take a path to compressed file as argument and return path to uncompressed one\ + */ +string uncompress_file (string file_path) { + + string ret = file_path; + if (substring (file_path, size (file_path) - 3, 3) == ".gz" && + gzip_installed ()) + { + list full = splitstring (file_path, "/"); + string file = full[size (full) - 1]:""; + if (!FileUtils::Exists (tmpdir + "/" + file)) + SCR::Execute (.target.bash, sformat ("cp %1 %2/", file_path, tmpdir)); + map o = (map)SCR::Execute (.target.bash_output, sformat ("cd %1; gunzip %2", tmpdir, file)); + if (o["exit"]:1 == 0) + ret = tmpdir + "/" + substring (file, 0, size (file) - 3); + else + y2warning ("gunzip failed with %1 (%2)", o["exit"]:0, o["stderr"]:""); + } + return ret; +} // read the pattern given by file name global map ReadPatternFile (string file_path) { y2milestone ("Importing pattern '%1'", file_path); + file_path = uncompress_file (file_path); map ret = $[]; map pt = (map) SCR::Read (.pattern, file_path); @@ -851,7 +881,7 @@ y2milestone ("Importing package description '%1'", file_path); - return PackagesDescr::Read (file_path); + return PackagesDescr::Read (uncompress_file (file_path)); } /** @@ -868,7 +898,7 @@ string descr_path = sformat ("%1/%2", dir_path, content_map["DESCRDIR"]:""); map out = (map) SCR::Execute (.target.bash_output, - sformat ("ls -A1 %1/*.pat 2>/dev/null", descr_path)); + sformat ("ls -A1 %1/*.pat %1/*.pat.gz 2>/dev/null", descr_path)); foreach (string f, splitstring(out["stdout"]:"", "\n"), { if (f == "") return; map pat = ReadPatternFile (f); @@ -1171,6 +1201,12 @@ foreach (string file, splitstring (out["stdout"]:"", "\n"), { list f = splitstring (file, "."); lang = f[size(f)-1]:"en"; + if (lang == "gz") // fortunatelly, there is no 'gz' locale... + { + if (size (f) > 2) + lang = f[size(f)-2]:"en"; + else return; + } if (file == "" || lang == "DU") return; packages_descr[lang] = ReadPackagesFile (file); }); @@ -1325,9 +1361,15 @@ { SCR::Execute (.target.bash, sformat ("/bin/rm -f '%1/packages' '%1/packages.DU'", descr_path)); - string cmd = sformat("/bin/cp %1/packages '%2'", tmpdir, descr_path); + string pth = tmpdir + "/packages"; + if (!FileUtils::Exists (pth) && FileUtils::Exists (pth + ".gz")) + pth = pth + ".gz"; + string cmd = sformat("/bin/cp %1 '%2'", pth, descr_path); SCR::Execute (.target.bash, cmd, $["LANG":"C"]); - cmd = sformat ("/bin/cp %1/packages.DU '%2'", tmpdir, descr_path); + pth = tmpdir + "/packages.DU"; + if (!FileUtils::Exists (pth) && FileUtils::Exists (pth + ".gz")) + pth = pth + ".gz"; + cmd = sformat ("/bin/cp %1 '%2'", pth, descr_path); SCR::Execute (.target.bash, cmd, $["LANG":"C"]); } @@ -1748,6 +1790,11 @@ foreach (string full_path, dirs_for_md5, { if (dir_has_files (full_path)) { + // whole dir was copied -> also with original MD5SUMS + if (FileUtils::Exists (full_path + "/MD5SUMS")) + { + SCR::Execute (.target.bash, sformat("cd '%1'; chmod +w . MD5SUMS; rm MD5SUMS", full_path)); + } string command = sformat("cd '%1'; md5sum -- * > MD5SUMS", full_path); map out = (map)SCR::Execute (.target.bash_output, command, $["LANG":"C"]); Modified: trunk/add-on-creator/src/add-on-creator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/add-on-creato… ============================================================================== --- trunk/add-on-creator/src/add-on-creator.ycp (original) +++ trunk/add-on-creator/src/add-on-creator.ycp Fri Sep 14 10:02:58 2007 @@ -146,8 +146,14 @@ foreach (string file, splitstring (out["stdout"]:"", "\n"), { list f = splitstring (file, "."); string lang = f[size(f)-1]:"en"; + if (lang == "gz") + { + if (size (f) > 2) lang = f[size(f)-2]:"en"; + else return; + } if (file == "" || lang == "DU") return; - AddOnCreator::packages_descr[lang] = AddOnCreator::ReadPackagesFile (file); + AddOnCreator::packages_descr[lang] = + AddOnCreator::ReadPackagesFile (file); }); } else Modified: trunk/add-on-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/complex.ycp?r… ============================================================================== --- trunk/add-on-creator/src/complex.ycp (original) +++ trunk/add-on-creator/src/complex.ycp Fri Sep 14 10:02:58 2007 @@ -278,7 +278,7 @@ requires == "sled-release-10")), `Left (`RadioButton(`id(`sled10sp1), `opt (`notify), // radio button label - _("SUSE L&inux Enterprise &Desktop 10 SP1"), + _("SUSE L&inux Enterprise Desktop 10 SP1"), requires == "product:SUSE_SLED = 10.1")), `Left (`RadioButton(`id(`sle10sp1), `opt (`notify), // radio button label @@ -1220,6 +1220,13 @@ } list f = splitstring (name, "."); lang = f[size(f)-1]:"en"; + if (lang == "gz") + { + if (size (f) > 2) lang = f[size(f)-2]:"en"; + else continue; + } + if (lang == "" || lang == "DU") + continue; map description = AddOnCreator::ReadPackagesFile (file); if (description == nil) continue; //TODO error handling descr[lang] = description; Modified: trunk/add-on-creator/src/patterns.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/patterns.ycp?… ============================================================================== --- trunk/add-on-creator/src/patterns.ycp (original) +++ trunk/add-on-creator/src/patterns.ycp Fri Sep 14 10:02:58 2007 @@ -239,6 +239,7 @@ `HBox ( `PushButton (`id(`add), `opt(`key_F6), Label::AddButton ()), `PushButton (`id(`edit), `opt(`key_F7), Label::EditButton ()), + `PushButton (`id(`delete), `opt(`key_F8), Label::DeleteButton ()), `HStretch (), // check box label `CheckBox (`id (`required), `opt (`notify, `key_F8), _("R&equired pattern"), false) @@ -341,6 +342,13 @@ } UI::SetFocus (`id(`pattern)); } + else if (ret == `delete) { + string key = (string)UI::QueryWidget (`id(`pattern),`CurrentItem); + patterns[sel] = remove (patterns[sel]:$[], key); + UI::ChangeWidget (`id(`pattern), `Items, + get_pattern_items (patterns[sel]:$[])); + UI::SetFocus (`id(`pattern)); + } else if (ret == `edit || ret == `pattern) { string key = (string)UI::QueryWidget (`id(`pattern),`CurrentItem); map pat = pattern_descr[key]:$[]; -- 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] r40903 - /tags/stable-2_15_22/mail/
by varkoly＠svn.opensuse.org 14 Sep '07

14 Sep '07

Author: varkoly Date: Fri Sep 14 06:54:19 2007 New Revision: 40903 URL: http://svn.opensuse.org/viewcvs/yast?rev=40903&view=rev Log: Created tag stable-2_15_22 for mail Added: tags/stable-2_15_22/mail/ - copied from r40902, trunk/mail/ -- 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] r40902 - in /trunk/mail: VERSION package/yast2-mail.changes
by varkoly＠svn.opensuse.org 14 Sep '07

14 Sep '07

Author: varkoly Date: Fri Sep 14 06:53:52 2007 New Revision: 40902 URL: http://svn.opensuse.org/viewcvs/yast?rev=40902&view=rev Log: new version for abuild Modified: trunk/mail/VERSION trunk/mail/package/yast2-mail.changes Modified: trunk/mail/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/VERSION?rev=40902&r1=40901&… ============================================================================== --- trunk/mail/VERSION (original) +++ trunk/mail/VERSION Fri Sep 14 06:53:52 2007 @@ -1 +1 @@ -2.15.21 +2.15.22 Modified: trunk/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?… ============================================================================== --- trunk/mail/package/yast2-mail.changes (original) +++ trunk/mail/package/yast2-mail.changes Fri Sep 14 06:53:52 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Sep 14 06:56:19 CEST 2007 - varkoly(a)suse.de + +- fixing mail advanced setup vizard +- 2.15.22 + +------------------------------------------------------------------- Tue Sep 4 11:15:17 CEST 2007 - varkoly(a)suse.de - #291378 - Enable Virus scanning does not install clamav -- 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] r40901 - in /trunk/mail/src: mail-server_dialogs.ycp mail-server_ldap-setup.ycp
by varkoly＠svn.opensuse.org 14 Sep '07

14 Sep '07

Author: varkoly Date: Fri Sep 14 06:51:45 2007 New Revision: 40901 URL: http://svn.opensuse.org/viewcvs/yast?rev=40901&view=rev Log: fix for determining if we are ldap client start yast2-ldap if neccessary Modified: trunk/mail/src/mail-server_dialogs.ycp trunk/mail/src/mail-server_ldap-setup.ycp Modified: trunk/mail/src/mail-server_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_dialogs.ycp… ============================================================================== --- trunk/mail/src/mail-server_dialogs.ycp (original) +++ trunk/mail/src/mail-server_dialogs.ycp Fri Sep 14 06:51:45 2007 @@ -40,7 +40,7 @@ Ldap::LDAPInit(); map<string, any> LDAPSettings = (map <string, any>) Ldap::Export(); list args = []; - if(LDAPSettings["bind_dn"]:"" == "" ) + if(LDAPSettings["ldap_domain"]:"" == "" ) { //No LDAP-Client configuration setup_ldap_server = true; ca_mgm = true; Modified: trunk/mail/src/mail-server_ldap-setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_ldap-setup.… ============================================================================== --- trunk/mail/src/mail-server_ldap-setup.ycp (original) +++ trunk/mail/src/mail-server_ldap-setup.ycp Fri Sep 14 06:51:45 2007 @@ -71,6 +71,10 @@ { WFM::CallFunction("ldap-server",[]); } + if(contains(args,"setup") ) + { + WFM::CallFunction("ldap",[]); + } Ldap::Read(); Ldap::LDAPInit(); map<string, any> LDAPSettings = (map<string, any>)Ldap::Export(); -- 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] r40900 - /trunk/country/package/yast2-country.changes
by kmachalkova＠svn.opensuse.org 13 Sep '07

13 Sep '07

Author: kmachalkova Date: Thu Sep 13 18:28:25 2007 New Revision: 40900 URL: http://svn.opensuse.org/viewcvs/yast?rev=40900&view=rev Log: changelog up :) Modified: trunk/country/package/yast2-country.changes Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Thu Sep 13 18:28:25 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Sep 13 18:26:15 CEST 2007 - kmachalkova(a)suse.cz + +- In 'change date and time' dialog, remember whether synchronization + with NTP server has been selected (#308238) +- On running system, do not call ntp-client functions before making + sure package yast2-ntp-client gets installed + +------------------------------------------------------------------- Tue Sep 11 21:21:01 CEST 2007 - jsuchome(a)suse.cz - do not call xset in text mode (#309438) -- 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] r40899 - /trunk/country/timezone/src/dialogs.ycp
by kmachalkova＠svn.opensuse.org 13 Sep '07

13 Sep '07

Author: kmachalkova Date: Thu Sep 13 18:25:38 2007 New Revision: 40899 URL: http://svn.opensuse.org/viewcvs/yast?rev=40899&view=rev Log: - Remember whether synchronization with NTP server has been selected (#308238) - Do not call ntp-client functions before making sure package yast2-ntp-client gets installed Modified: trunk/country/timezone/src/dialogs.ycp Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp… ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Thu Sep 13 18:25:38 2007 @@ -142,11 +142,25 @@ Popup::Error( sformat("Invalid NTP server hostname %1", server) ); } + boolean ntp_used = false; + + void CreateUI() { + WFM::CallFunction("ntp-client_proposal", ["CreateUI"]); + + ntp_used = (boolean) WFM::CallFunction("ntp-client_proposal", ["GetUseNTP"]); + + if ( UI::WidgetExists(`id(`ntp_content)) ) + { + UI::ChangeWidget(`id(`rb), `CurrentButton, (ntp_used ? `ntp : `manual)); + enable_disable_widgets(ntp_used); + } + } + term cont = `HBox ( `RadioButtonGroup (`id (`rb), `HCenter (`VBox ( `Left (`VBox ( // radio button label (= how to setup time) - `Left (`RadioButton (`id (`manual), `opt (`notify), _("Manually"), true)), + `Left (`RadioButton (`id (`manual), `opt (`notify), _("Manually"))), `VSpacing (0.5), `HBox ( `HSpacing (3), @@ -157,15 +171,26 @@ ) ), `VSpacing (1), - `ReplacePoint(`id(`rp), `Empty()) + `Left (`VBox ( `id(`ntp_content), + `Left (`RadioButton (`id (`ntp), `opt (`notify), + // radio button label + _("Synchronize with NTP Server"), false)), + `ReplacePoint(`id(`rp), `Empty()) + ) + ) )) - )))); + )))); + Wizard::OpenAcceptDialog (); Wizard::SetContents (_("Change Date and Time"), cont, htext, true, true); Wizard::SetDesktopIcon("timezone"); - WFM::CallFunction("ntp-client_proposal", ["CreateUI"]); - enable_disable_widgets(false); + + boolean ntp_installed = (Stage::initial() || Package::Installed ("yast2-ntp-client")); + + if (ntp_installed) { + CreateUI(); + } if (!dt_widgets) { @@ -176,8 +201,6 @@ }); } - boolean ntp_installed = false; - boolean ntp_used = false; any ret = nil; repeat @@ -192,10 +215,12 @@ ntp_installed = Package::Install ("yast2-ntp-client"); if (!ntp_installed) { - ntp_used = false; + ntp_used = false; UI::ChangeWidget (`id (`manual), `Value, true); UI::ChangeWidget (`id (`ntp), `Value, false); } + else + CreateUI(); } if (ntp_used ) { @@ -287,6 +312,7 @@ } } until( ret==`accept || ret==`cancel ); + WFM::CallFunction("ntp-client_proposal", [ "SetUseNTP", $["ntp_used" : ntp_used] ]); Wizard::CloseDialog (); return (ret == `accept); }; -- 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] r40898 - /tags/stable-2_15_10/ntp-client/
by kmachalkova＠svn.opensuse.org 13 Sep '07

13 Sep '07

Author: kmachalkova Date: Thu Sep 13 18:14:57 2007 New Revision: 40898 URL: http://svn.opensuse.org/viewcvs/yast?rev=40898&view=rev Log: Created tag stable-2_15_10 for ntp-client Added: tags/stable-2_15_10/ntp-client/ - copied from r40897, trunk/ntp-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0