October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41677 - /trunk/update/src/clients/inst_update.ycp
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:38:53 2007 New Revision: 41677 URL: http://svn.opensuse.org/viewcvs/yast?rev=41677&view=rev Log: - installedVersion and updateVersion moved from 'Update' to 'Installation' YCP module to remove dependencies. Modified: trunk/update/src/clients/inst_update.ycp Modified: trunk/update/src/clients/inst_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/inst_update.y… ============================================================================== --- trunk/update/src/clients/inst_update.ycp (original) +++ trunk/update/src/clients/inst_update.ycp Wed Oct 31 13:38:53 2007 @@ -131,7 +131,7 @@ updates the existing software and installs all new features and benefits of the new <tt>%1</tt> version. The selection is based on the former predefined software selection.</p> -"), Update::updateVersion["show"]:""); +"), Installation::updateVersion["show"]:""); // help text for dialog "update options" 3/4 helptext = helptext + _("<p><b>Only Installed Packages:</b> This selection -- 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] r41676 - /tags/stable-2_16_0/update/
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:36:49 2007 New Revision: 41676 URL: http://svn.opensuse.org/viewcvs/yast?rev=41676&view=rev Log: Err, one more :) Removed: tags/stable-2_16_0/update/ -- 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] r41675 - /tags/stable-2_16_0/update/
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:34:54 2007 New Revision: 41675 URL: http://svn.opensuse.org/viewcvs/yast?rev=41675&view=rev Log: Created tag stable-2_16_0 for update Added: tags/stable-2_16_0/update/ - copied from r41674, trunk/update/ -- 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] r41674 - /trunk/update/testsuite/tests/Update_GetProductName.hiddenycp
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:34:36 2007 New Revision: 41674 URL: http://svn.opensuse.org/viewcvs/yast?rev=41674&view=rev Log: One more change (as the previos ones) Modified: trunk/update/testsuite/tests/Update_GetProductName.hiddenycp Modified: trunk/update/testsuite/tests/Update_GetProductName.hiddenycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/testsuite/tests/Update_Ge… ============================================================================== --- trunk/update/testsuite/tests/Update_GetProductName.hiddenycp (original) +++ trunk/update/testsuite/tests/Update_GetProductName.hiddenycp Wed Oct 31 13:34:36 2007 @@ -34,6 +34,7 @@ import "Update"; import "Mode"; + import "Installation"; Mode::SetTest("testsuite"); @@ -46,7 +47,7 @@ DUMP ("------------------------------------------------------------"); TEST (``(Update::GetProductName()), [READ, WRITE, EXEC], nil); DUMP (prd_string); - DUMP (Update::installedVersion); + DUMP (Installation::installedVersion); }); } -- 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] r41673 - in /trunk/update/src/clients: inst_update.ycp update_proposal.ycp
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:27:31 2007 New Revision: 41673 URL: http://svn.opensuse.org/viewcvs/yast?rev=41673&view=rev Log: - installedVersion and updateVersion moved from 'Update' to 'Installation' YCP module to remove dependencies. Modified: trunk/update/src/clients/inst_update.ycp trunk/update/src/clients/update_proposal.ycp Modified: trunk/update/src/clients/inst_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/inst_update.y… ============================================================================== --- trunk/update/src/clients/inst_update.ycp (original) +++ trunk/update/src/clients/inst_update.ycp Wed Oct 31 13:27:31 2007 @@ -20,7 +20,7 @@ import "RootPart"; import "Update"; import "Packages"; - + import "Installation"; // screen title for update options string title = _("Update Options"); @@ -69,8 +69,8 @@ // Build and show dialog - string from_version = Update::installedVersion["show"]:_("Unknown"); - string to_version = Update::updateVersion["show"]:_("Unknown"); + string from_version = Installation::installedVersion["show"]:_("Unknown"); + string to_version = Installation::updateVersion["show"]:_("Unknown"); string update_label = ""; if (from_version == to_version) { Modified: trunk/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/update_propos… ============================================================================== --- trunk/update/src/clients/update_proposal.ycp (original) +++ trunk/update/src/clients/update_proposal.ycp Wed Oct 31 13:27:31 2007 @@ -448,22 +448,22 @@ // TRANSLATORS: unknown product (label) string update_from = _("Unknown product"); - if (Update::installedVersion["show"]:"" != "" && Update::installedVersion["show"]:"?" != "?") { - update_from = Update::installedVersion["show"]:""; - } else if (Update::installedVersion["version"]:"" != "" && Update::installedVersion["version"]:"?" != "?") { - update_from = Update::installedVersion["name"]:""; + if (Installation::installedVersion["show"]:"" != "" && Installation::installedVersion["show"]:"?" != "?") { + update_from = Installation::installedVersion["show"]:""; + } else if (Installation::installedVersion["version"]:"" != "" && Installation::installedVersion["version"]:"?" != "?") { + update_from = Installation::installedVersion["name"]:""; } // TRANSLATORS: unknown product (label) string update_to = _("Unknown product"); - if (Update::updateVersion["show"]:"" != "") { - update_to = Update::updateVersion["show"]:""; - } else if (Update::updateVersion["version"]:"" != "") { - update_to = Update::updateVersion["name"]:""; + if (Installation::updateVersion["show"]:"" != "") { + update_to = Installation::updateVersion["show"]:""; + } else if (Installation::updateVersion["version"]:"" != "") { + update_to = Installation::updateVersion["name"]:""; } // when versions don't match and upgrade is not allowed (running system) - if ((Update::installedVersion["version"]:"A" != Update::updateVersion["version"]:"B") && Update::disallow_upgrade) { + if ((Installation::installedVersion["version"]:"A" != Installation::updateVersion["version"]:"B") && Update::disallow_upgrade) { return $[ "warning" : sformat( // TRANSLATORS: proposal error, %1 is the version of installed system // %2 is the version being installed @@ -479,14 +479,14 @@ string warning_message = nil; // when labels don't match - if (!Stage::initial() && (Update::installedVersion["show"]:"A" != Update::updateVersion["show"]:"B")) { + if (!Stage::initial() && (Installation::installedVersion["show"]:"A" != Installation::updateVersion["show"]:"B")) { warning_message = sformat( // TRANSLATORS: proposal warning, both %1 and %2 are replaced with product names _("Warning: Updating from '%1' to '%2', products do not exactly match."), // TRANSLATORS: unknown product name - Update::installedVersion["show"]:_("Unknown product"), + Installation::installedVersion["show"]:_("Unknown product"), // TRANSLATORS: unknown product name - Update::updateVersion["show"]:_("Unknown product") + Installation::updateVersion["show"]:_("Unknown product") ); } -- 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] r41672 - /tags/stable-2_16_0/update/
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:24:49 2007 New Revision: 41672 URL: http://svn.opensuse.org/viewcvs/yast?rev=41672&view=rev Log: More changes... Removed: tags/stable-2_16_0/update/ -- 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] r41671 - /tags/stable-2_16_0/update/
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:23:48 2007 New Revision: 41671 URL: http://svn.opensuse.org/viewcvs/yast?rev=41671&view=rev Log: Created tag stable-2_16_0 for update Added: tags/stable-2_16_0/update/ - copied from r41670, trunk/update/ -- 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] r41670 - /tags/stable-2_16_4/yast2/
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:23:05 2007 New Revision: 41670 URL: http://svn.opensuse.org/viewcvs/yast?rev=41670&view=rev Log: Created tag stable-2_16_4 for yast2 Added: tags/stable-2_16_4/yast2/ - copied from r41669, trunk/yast2/ -- 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] r41669 - in /trunk/update: VERSION package/yast2-update.changes src/modules/RootPart.ycp src/modules/Update.ycp yast2-update.spec.in
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:22:48 2007 New Revision: 41669 URL: http://svn.opensuse.org/viewcvs/yast?rev=41669&view=rev Log: - installedVersion and updateVersion moved from 'Update' to 'Installation' YCP module to remove dependencies. - 2.16.0 Modified: trunk/update/VERSION trunk/update/package/yast2-update.changes trunk/update/src/modules/RootPart.ycp trunk/update/src/modules/Update.ycp trunk/update/yast2-update.spec.in Modified: trunk/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=41669&r1=4166… ============================================================================== --- trunk/update/VERSION (original) +++ trunk/update/VERSION Wed Oct 31 13:22:48 2007 @@ -1 +1 @@ -2.15.23 +2.16.0 Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Wed Oct 31 13:22:48 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 31 13:21:55 CET 2007 - locilka(a)suse.cz + +- installedVersion and updateVersion moved from 'Update' to + 'Installation' YCP module to remove dependencies. +- 2.16.0 + +------------------------------------------------------------------- Thu Oct 25 14:00:51 CEST 2007 - locilka(a)suse.cz - Never list duplicate entries in "upgrade based on products" in Modified: trunk/update/src/modules/RootPart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/RootPart.ycp?… ============================================================================== --- trunk/update/src/modules/RootPart.ycp (original) +++ trunk/update/src/modules/RootPart.ycp Wed Oct 31 13:22:48 2007 @@ -624,7 +624,7 @@ // translate them list <string> new_names = Storage::GetTranslatedDevices ( - Update::installedVersion, Update::updateVersion, old_names + Installation::installedVersion, Installation::updateVersion, old_names ); integer i = 0; @@ -1535,7 +1535,7 @@ `Label(_("Mounting partitions. One moment please..."))); boolean tmp = RootPart::MountPartitions (RootPart::selectedRootPartition); - sleep (500); + // sleep (500); UI::CloseDialog (); Modified: trunk/update/src/modules/Update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/Update.ycp?re… ============================================================================== --- trunk/update/src/modules/Update.ycp (original) +++ trunk/update/src/modules/Update.ycp Wed Oct 31 13:22:48 2007 @@ -68,25 +68,17 @@ global boolean products_incompatible = false; - - /* - * Information about old and new product. - * - * They do contain: - * name (string), e.g. "SuSE Linux" - * version (string), e.g. "9.1" - * nameandversion (string), e.g. "SuSE Linux 9.1" - * - * They may contain: - * major (integer), e.g. "9" - * minor (integer), e.g. "1" - */ - // Version of the targetsystem - global map <string, any> installedVersion = $[]; + // + // !!! moved to Installation::installedVersion !!! + // + // global map <string, any> installedVersion = $[]; // Version of the source medium - global map <string, any> updateVersion = $[]; + // + // !!! moved to Installation::updateVersion !!! + // + // global map <string, any> updateVersion = $[]; // Flag, if the basesystem have to be installed @@ -472,13 +464,13 @@ /** * Read product name and version for the old and new release. - * Fill installedVersion and updateVersion. + * Fill Installation::installedVersion and Installation::updateVersion. * @return success */ global define boolean GetProductName () { - installedVersion = $[]; - updateVersion = $[]; + Installation::installedVersion = $[]; + Installation::updateVersion = $[]; // get old product name @@ -501,32 +493,32 @@ if (p == nil) { y2error ("release info <%1> is screwed", old_name); - installedVersion = $[]; + Installation::installedVersion = $[]; } else { - installedVersion["show"] = old_name; - installedVersion["name"] = substring (old_name, 0, p); - installedVersion["version"] = substring (old_name, p + 1); - fill_version_map (installedVersion); + Installation::installedVersion["show"] = old_name; + Installation::installedVersion["name"] = substring (old_name, 0, p); + Installation::installedVersion["version"] = substring (old_name, p + 1); + fill_version_map (Installation::installedVersion); } // "minor" and "major" version keys // bug #153576, "version" == "9" or "10.1" or ... - string inst_ver = installedVersion["version"]:""; + string inst_ver = Installation::installedVersion["version"]:""; if (inst_ver != "" && inst_ver != nil) { // SLE, SLD, OES... if (regexpmatch (inst_ver, "^[0123456789]+$")) { - installedVersion["major"] = tointeger (inst_ver); + Installation::installedVersion["major"] = tointeger (inst_ver); // openSUSE } else if (regexpmatch (inst_ver, "^[0123456789]+\.[0123456789]+$")) { - installedVersion["major"] = tointeger (regexpsub (inst_ver, "^([0123456789]+)\.[0123456789]+$", "\\1")); - installedVersion["minor"] = tointeger (regexpsub (inst_ver, "^[0123456789]+\.([0123456789]+)$", "\\1")); + Installation::installedVersion["major"] = tointeger (regexpsub (inst_ver, "^([0123456789]+)\.[0123456789]+$", "\\1")); + Installation::installedVersion["minor"] = tointeger (regexpsub (inst_ver, "^[0123456789]+\.([0123456789]+)$", "\\1")); } else { y2error("Cannot find out major/minor from >%1<", inst_ver); } } else { - y2error("Cannot find out version: %1", installedVersion); + y2error("Cannot find out version: %1", Installation::installedVersion); } if (Mode::test()) { @@ -541,9 +533,9 @@ if (num <= 0) { y2error ("No source"); - updateVersion["name"] = "?"; - updateVersion["version"] = "?"; - fill_version_map (updateVersion); + Installation::updateVersion["name"] = "?"; + Installation::updateVersion["version"] = "?"; + fill_version_map (Installation::updateVersion); return false; } @@ -556,7 +548,7 @@ // source need to be described if (source_map != $[]) { - if (source_map["productversion"]:"A" == installedVersion["version"]:"B") { + if (source_map["productversion"]:"A" == Installation::installedVersion["version"]:"B") { y2milestone ("Found matching product: %1", source_map); // first valid product is selected if (update_to_source == nil) @@ -578,45 +570,45 @@ if (new_product == nil) { - updateVersion["name"] = "?"; - updateVersion["version"] = "?"; - y2error("Cannot find out source details: %1", updateVersion); - fill_version_map (updateVersion); + Installation::updateVersion["name"] = "?"; + Installation::updateVersion["version"] = "?"; + y2error("Cannot find out source details: %1", Installation::updateVersion); + fill_version_map (Installation::updateVersion); return false; } // bugzilla #225256, use "label" first, then a "productname" - updateVersion["show"] = new_product["label"]:nil; - if (updateVersion["show"]:nil == nil) { + Installation::updateVersion["show"] = new_product["label"]:nil; + if (Installation::updateVersion["show"]:nil == nil) { y2warning ("No \"label\" defined in product"); if (new_product["productname"]:"?" == "?" && new_product["productversion"]:"?" == "?") { - updateVersion["show"] = "?"; + Installation::updateVersion["show"] = "?"; } else { - updateVersion["show"] = new_product["productname"]:"?" + " " + new_product["productversion"]:"?"; + Installation::updateVersion["show"] = new_product["productname"]:"?" + " " + new_product["productversion"]:"?"; } } - updateVersion["name"] = new_product["label"]:new_product["productname"]:"?"; - updateVersion["version"] = new_product["productversion"]:"?"; - fill_version_map (updateVersion); + Installation::updateVersion["name"] = new_product["label"]:new_product["productname"]:"?"; + Installation::updateVersion["version"] = new_product["productversion"]:"?"; + fill_version_map (Installation::updateVersion); - string new_ver = updateVersion["version"]:""; + string new_ver = Installation::updateVersion["version"]:""; if (new_ver != "" && new_ver != nil) { // SLE, SLD, OES... if (regexpmatch (new_ver, "^[0123456789]+$")) { - updateVersion["major"] = tointeger (new_ver); + Installation::updateVersion["major"] = tointeger (new_ver); // openSUSE } else if (regexpmatch (new_ver, "^[0123456789]+\.[0123456789]$")) { - updateVersion["major"] = tointeger (regexpsub (new_ver, "^([0123456789]+)\.[0123456789]$", "\\1")); - updateVersion["minor"] = tointeger (regexpsub (new_ver, "^[0123456789]+\.([0123456789])$", "\\1")); + Installation::updateVersion["major"] = tointeger (regexpsub (new_ver, "^([0123456789]+)\.[0123456789]$", "\\1")); + Installation::updateVersion["minor"] = tointeger (regexpsub (new_ver, "^[0123456789]+\.([0123456789])$", "\\1")); } else { y2error("Cannot find out major/minor from %1", new_ver); } } else { - y2error("Cannot find out version: %1", updateVersion); + y2error("Cannot find out version: %1", Installation::updateVersion); } - y2milestone ("update from %1 to %2", installedVersion, updateVersion); + y2milestone ("update from %1 to %2", Installation::installedVersion, Installation::updateVersion); return true; } Modified: trunk/update/yast2-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/yast2-update.spec.in?rev=… ============================================================================== --- trunk/update/yast2-update.spec.in (original) +++ trunk/update/yast2-update.spec.in Wed Oct 31 13:22:48 2007 @@ -1,10 +1,15 @@ @HEADER-COMMENT@ @HEADER@ -BuildRequires: yast2-storage yast2-packager perl-XML-Writer yast2 yast2-devtools yast2-testsuite update-desktop-files +BuildRequires: yast2-storage yast2-packager perl-XML-Writer yast2-devtools yast2-testsuite update-desktop-files +BuildRequires: yast2 >= 2.16.4 # package not really needed to be installed but this breaks the building cycle + +# FIXME !!! #!BuildIgnore: autoyast2-installation -Requires: yast2 + +# Installation::installedVersion && Installation::updateVersion +Requires: yast2 >= 2.16.4 Requires: yast2-installation Requires: yast2-packager -- 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] r41668 - in /trunk/yast2: VERSION library/control/src/Installation.ycp package/yast2.changes yast2.spec.in
by locilka＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: locilka Date: Wed Oct 31 13:21:40 2007 New Revision: 41668 URL: http://svn.opensuse.org/viewcvs/yast?rev=41668&view=rev Log: - installedVersion and updateVersion moved from 'Update' to 'Installation' YCP module to remove dependencies. - 2.16.4 Modified: trunk/yast2/VERSION trunk/yast2/library/control/src/Installation.ycp trunk/yast2/package/yast2.changes trunk/yast2/yast2.spec.in Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=41668&r1=41667… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Wed Oct 31 13:21:40 2007 @@ -1 +1 @@ -2.16.3 +2.16.4 Modified: trunk/yast2/library/control/src/Installation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/control/src/Instal… ============================================================================== --- trunk/yast2/library/control/src/Installation.ycp (original) +++ trunk/yast2/library/control/src/Installation.ycp Wed Oct 31 13:21:40 2007 @@ -112,6 +112,34 @@ */ global boolean license_accepted = false; + // These maps are used by several YaST modules. + + /** + * Version of the targetsystem (currently installed one). + * + * @struct $[ + * "name" : (string) "openSUSE", + * "version" : (string) "10.1", + * "nameandversion" : (string) "openSUSE 10.1", + * "major" : (integer) 10, + * "minor" : (integer) 1, + * ] + */ + global map <string, any> installedVersion = $[]; + + /** + * Version of system to update to (will be installed, or is + * just being installed). + * + * @struct $[ + * "name" : (string) "openSUSE", + * "version" : (string) "11.0", + * "nameandversion" : (string) "openSUSE 11.0", + * "major" : (integer) 11, + * "minor" : (integer) 0, + * ] + */ + global map <string, any> updateVersion = $[]; //--------------------------------------------------------------- // constructor 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 Wed Oct 31 13:21:40 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 31 13:19:42 CET 2007 - locilka(a)suse.cz + +- installedVersion and updateVersion moved from 'Update' to + 'Installation' YCP module to remove dependencies. +- 2.16.4 + +------------------------------------------------------------------- Tue Oct 30 17:24:06 CET 2007 - locilka(a)suse.cz - Modules Hotplug and HwStatus moved here from yast2-installation Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=41668&r1… ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Wed Oct 31 13:21:40 2007 @@ -28,6 +28,7 @@ Conflicts: yast2-network < 2.15.58 # Hotplug and HwStatus modules Conflicts: yast2-installation < 2.16.2 +Conflicts: yast2-update < 2.16.0 Provides: yast2-lib-sequencer Obsoletes: yast2-lib-sequencer -- 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] r41667 - in /trunk/mail: agents/sysconfig.mail src/MailServer.ycp src/mail-server_complex.ycp src/mail-server_dialogs.ycp src/mail-server_wizards.ycp src/mail.ycp
by varkoly＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: varkoly Date: Wed Oct 31 12:29:56 2007 New Revision: 41667 URL: http://svn.opensuse.org/viewcvs/yast?rev=41667&view=rev Log: fixing the return values of wizard elements Modified: trunk/mail/agents/sysconfig.mail trunk/mail/src/MailServer.ycp trunk/mail/src/mail-server_complex.ycp trunk/mail/src/mail-server_dialogs.ycp trunk/mail/src/mail-server_wizards.ycp trunk/mail/src/mail.ycp Modified: trunk/mail/agents/sysconfig.mail URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/agents/sysconfig.mail?rev=4… ============================================================================== --- trunk/mail/agents/sysconfig.mail (original) +++ trunk/mail/agents/sysconfig.mail Wed Oct 31 12:29:56 2007 @@ -46,4 +46,4 @@ # # This variable contains the type of the mail server configuration. # -CONF_TYPE="undef" +CONFIG_TYPE="undef" Modified: trunk/mail/src/MailServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServer.ycp?rev=4166… ============================================================================== --- trunk/mail/src/MailServer.ycp (original) +++ trunk/mail/src/MailServer.ycp Wed Oct 31 12:29:56 2007 @@ -159,6 +159,8 @@ return Package::Installed (package); } +global boolean pam_ldap_installed = false; +global boolean nss_ldap_installed = false; global boolean procmail_installed = false; global boolean amavis_installed = false; global boolean ldap_installed = false; @@ -258,6 +260,8 @@ */ global boolean CheckPackages() { + pam_ldap_installed = Installed("pam_ldap"); + nss_ldap_installed = Installed("nss_ldap"); procmail_installed = Installed("procmail"); cyrus_installed = Installed("cyrus-imapd"); postfix_installed = Installed("postfix"); @@ -269,16 +273,26 @@ string to_install = ""; list<string> l_to_install = []; - if (!ldap_installed) + if (!pam_ldap_installed) { - l_to_install = add( l_to_install, "yast2-ldap-client" ); - to_install = to_install + "yast2-ldap-client\n"; + l_to_install = add( l_to_install, "pam_ldap" ); + to_install = to_install + "pam_ldap\n"; + } + if (!nss_ldap_installed) + { + l_to_install = add( l_to_install, "nss_ldap" ); + to_install = to_install + "nss_ldap\n"; } if (!postfix_installed) { l_to_install = add( l_to_install, "postfix" ); to_install = to_install + "postfix\n"; } + if (!ldap_installed) + { + l_to_install = add( l_to_install, "yast2-ldap-client" ); + to_install = to_install + "yast2-ldap-client\n"; + } if(!sasl_installed) { l_to_install = add( l_to_install, "cyrus-sasl-plain" ); Modified: trunk/mail/src/mail-server_complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_complex.ycp… ============================================================================== --- trunk/mail/src/mail-server_complex.ycp (original) +++ trunk/mail/src/mail-server_complex.ycp Wed Oct 31 12:29:56 2007 @@ -37,7 +37,7 @@ * Read settings dialog * @return `abort if aborted and `next otherwise */ -boolean SetupDialog() { +symbol SetupDialog() { Wizard::RestoreHelp(HELPS["setup"]:""); string caption = _("Setup the Mail Server"); integer steps = 3; @@ -74,17 +74,17 @@ Progress::NextStage(); if( ! MailServer::CheckPackages() ) { - return false; + return `abort; } sleep(sl); // read packages Progress::NextStage(); if( CheckLDAPDialog() != `ok ) { - return false; + return `abort; } sleep(sl); - return true; + return `next; } /** 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 Wed Oct 31 12:29:56 2007 @@ -41,7 +41,8 @@ Ldap::LDAPInit(); map<string, any> LDAPSettings = (map <string, any>) Ldap::Export(); list args = []; - if(LDAPSettings["ldap_domain"]:"" == "" ) + y2milestone(" LDAPSettings %1", LDAPSettings); + if( ! LDAPSettings["start_ldap"]:false ) { //No LDAP-Client configuration setup_ldap_server = true; ca_mgm = true; @@ -102,6 +103,7 @@ { // Now we setup the ca managemant args = add(args, "ca_mgm"); } + Progress::NextStage(); if( setup_ldap_server ) { // Now we setup the LDAP Server args = add(args, "setup"); @@ -110,6 +112,7 @@ Ldap::LDAPInit(); LDAPSettings = (map <string, any>) Ldap::Export(); } + Progress::NextStage(); MailServer::AdminPassword = Ldap::LDAPAskAndBind(false); if( MailServer::AdminPassword != nil ) { @@ -124,11 +127,12 @@ //tell Ldap module to create the default objects: LDAPSettings [ "create_ldap" ] = true; Ldap::Import(LDAPSettings); +y2milestone("after LDAPSettings %1", LDAPSettings); //write the settings: Ldap::Write(abort); //create default mail-server configuration YaPI::MailServer::ResetMailServer(MailServer::AdminPassword,LDAPSettings); - return `next; + return `ok; } else { Modified: trunk/mail/src/mail-server_wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_wizards.ycp… ============================================================================== --- trunk/mail/src/mail-server_wizards.ycp (original) +++ trunk/mail/src/mail-server_wizards.ycp Wed Oct 31 12:29:56 2007 @@ -109,6 +109,10 @@ `abort : `abort, `next : "main" ], + "main" : $[ + `abort : `abort, + `next : `next + ] ]; Wizard::CreateDialog(); Modified: trunk/mail/src/mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.ycp?rev=41667&r1=4… ============================================================================== --- trunk/mail/src/mail.ycp (original) +++ trunk/mail/src/mail.ycp Wed Oct 31 12:29:56 2007 @@ -204,6 +204,8 @@ { ret = WFM::CallFunction("mail-standard",args); } + y2milestone ("Mail module %1 returned %2", conf_type, ret); + if( ret != nil && ret != `cancel && ret != `abort ) { SCR::Write (.sysconfig.mail.CONFIG_TYPE, conf_type); -- 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] r41666 - /branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc
by gs＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: gs Date: Wed Oct 31 12:02:19 2007 New Revision: 41666 URL: http://svn.opensuse.org/viewcvs/yast?rev=41666&view=rev Log: correct spacing Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Wed Oct 31 12:02:19 2007 @@ -220,7 +220,7 @@ // HBox for the buttons NCLayoutBox * hSplit3 = new NCLayoutBox( split, YD_HORIZ ); - new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ); // stretchable = true + new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); // stretchable = true // add the OK button okButton = new NCPushButton( hSplit3, _( "&OK" ) ); @@ -230,7 +230,7 @@ YStringWidgetID * okID = new YStringWidgetID( idOk ); okButton->setId( okID ); - new NCSpacing( hSplit1, YD_HORIZ, true, 0.4 ); + new NCSpacing( hSplit3, YD_HORIZ, true, 0.4 ); // add the Cancel button cancelButton = new NCPushButton( hSplit3, _( "&Cancel" ) ); @@ -240,7 +240,7 @@ YStringWidgetID * cancelID = new YStringWidgetID( idCancel ); cancelButton->setId( cancelID ); - new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ); + new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); } /////////////////////////////////////////////////////////////////// -- 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] r41665 - in /branches/tmp/sh/mod-ui/ncurses/src: NCAskForDirectory.cc NCAskForFile.cc
by gs＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: gs Date: Wed Oct 31 11:56:59 2007 New Revision: 41665 URL: http://svn.opensuse.org/viewcvs/yast?rev=41665&view=rev Log: setNotify for checkbox Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc Wed Oct 31 11:56:59 2007 @@ -94,26 +94,13 @@ void NCAskForExistingDirectory::createLayout( const YCPString & iniDir, const YCPString & headline ) { - // FIXME - check all options settings! - YWidgetOpt opt; - // the vertical split is the (only) child of the dialog NCLayoutBox * split = new NCLayoutBox( this, YD_VERT ); - // addChild() is obsolete (handled by new libyui) - - opt.notifyMode.setValue( false ); - // the headline new NCLabel( split, headline->value(), true, false ); // isHeading = true - new NCSpacing( split, YD_VERT, false, 0.4 ); - NCFrame * frame = new NCFrame( split, "" ); - //NCLayoutBox * vSplit = new NCLayoutBox( frame, YD_VERT ); - - opt.isEditable.setValue( false ); // see dirName - opt.notifyMode.setValue( true ); // see dirName // label for text field showing the selected dir dirName = new NCComboBox( frame, _( "Selected Directory:" ), false ); // editable = false @@ -123,8 +110,6 @@ YStringWidgetID * dirID = new YStringWidgetID( idDirName ); dirName->setId( dirID ); - //new NCSpacing( vSplit, YD_VERT, false, 0.6 ); - // add the checkBox detailed NCLayoutBox * hSplit = new NCLayoutBox( split, YD_HORIZ ); @@ -132,10 +117,8 @@ detailed = new NCCheckBox( hSplit, _( "&Detailed View" ), false ); YStringWidgetID * detailsID = new YStringWidgetID( idDetails ); detailed->setId( detailsID ); + detailed->setNotify( true ); - //hSplit->addChild( new NCSpacing( hSplit, opt, 0.1, true, false ) ); - new NCSpacing( hSplit, YD_HORIZ, true, 0.1 ); // stretchable = true - // create table header for table type T_Overview YTableHeader * tableHeader = new YTableHeader(); tableHeader->addColumn( " ", YAlignBegin ); @@ -150,38 +133,31 @@ YStringWidgetID * dirListID = new YStringWidgetID( idDirList ); dirList->setId( dirListID ); - //split->addChild( new NCSpacing( split, opt, 0.4, false, true ) ); - new NCSpacing( split, YD_VERT, false, 0.4 ); + new NCSpacing( split, YD_VERT, false, 1.0 ); // HBox for the buttons NCLayoutBox * hSplit1 = new NCLayoutBox( split, YD_HORIZ ); - opt.isHStretchable.setValue( true ); - //hSplit1->addChild( new NCSpacing( hSplit1, opt, 0.2, true, false ) ); new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ); // stretchable = true - opt.key_Fxx.setValue( 10 ); // see okButton - // add the OK button okButton = new NCPushButton( hSplit1, _( "&OK" ) ); okButton->setFunctionKey( 10 ); + okButton->setStretchable( YD_HORIZ, true ); YStringWidgetID * okID = new YStringWidgetID ( idOk ); okButton->setId( okID ); - //hSplit1->addChild( new NCSpacing( hSplit1, opt, 0.4, true, false ) ); new NCSpacing( hSplit1, YD_HORIZ, true, 0.4 ); - opt.key_Fxx.setValue( 9 ); // see cancelButton - // add the Cancel button cancelButton = new NCPushButton( hSplit1, _( "&Cancel" ) ); cancelButton->setFunctionKey( 9 ); + cancelButton->setStretchable( YD_HORIZ, true); YStringWidgetID * cancelID = new YStringWidgetID (idCancel ); cancelButton->setId( cancelID ); - //hSplit1->addChild( new NCSpacing( hSplit1, opt, 0.2, true, false ) ); new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ); } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Wed Oct 31 11:56:59 2007 @@ -158,6 +158,7 @@ detailed = new NCCheckBox( hSplit, _( "&Detailed View" ), false ); YStringWidgetID * detailsID = new YStringWidgetID( idDetails ); detailed->setId( detailsID ); + detailed->setNotify( true ); // HBox for the lists NCLayoutBox * hSplit1 = new NCLayoutBox( split, YD_HORIZ ); @@ -219,6 +220,8 @@ // HBox for the buttons NCLayoutBox * hSplit3 = new NCLayoutBox( split, YD_HORIZ ); + new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ); // stretchable = true + // add the OK button okButton = new NCPushButton( hSplit3, _( "&OK" ) ); okButton->setFunctionKey( 10 ); @@ -227,6 +230,8 @@ YStringWidgetID * okID = new YStringWidgetID( idOk ); okButton->setId( okID ); + new NCSpacing( hSplit1, YD_HORIZ, true, 0.4 ); + // add the Cancel button cancelButton = new NCPushButton( hSplit3, _( "&Cancel" ) ); cancelButton->setFunctionKey( 9 ); @@ -235,6 +240,7 @@ YStringWidgetID * cancelID = new YStringWidgetID( idCancel ); cancelButton->setId( cancelID ); + new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ); } /////////////////////////////////////////////////////////////////// -- 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] r41664 - in /trunk/metapackage: package/yast2-metapackage-handler.changes src/OneClickInstall.ycp src/OneClickInstallWorkerResponse.ycp
by benjimanw＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: benjimanw Date: Wed Oct 31 11:40:03 2007 New Revision: 41664 URL: http://svn.opensuse.org/viewcvs/yast?rev=41664&view=rev Log: Fixes bugs 310813 and 331557 Modified: trunk/metapackage/package/yast2-metapackage-handler.changes trunk/metapackage/src/OneClickInstall.ycp trunk/metapackage/src/OneClickInstallWorkerResponse.ycp Modified: trunk/metapackage/package/yast2-metapackage-handler.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/package/yast2-metapa… ============================================================================== --- trunk/metapackage/package/yast2-metapackage-handler.changes (original) +++ trunk/metapackage/package/yast2-metapackage-handler.changes Wed Oct 31 11:40:03 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Oct 31 10:40:00 GMT 2007 - benji.weber(a)gmail.com + +- Allow package names that are not valid XML element names e.g. 3ddiag (#331557) +- Alter default error message to indicate most likely cause for failure - user didn't enter password (#310813) +------------------------------------------------------------------- Thu Oct 4 15:34:25 CEST 2007 - mvidner(a)suse.cz - Use an actual icon (sw_single) for the YaST windows instead of the Modified: trunk/metapackage/src/OneClickInstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstall.… ============================================================================== --- trunk/metapackage/src/OneClickInstall.ycp (original) +++ trunk/metapackage/src/OneClickInstall.ycp Wed Oct 31 11:40:03 2007 @@ -757,7 +757,7 @@ { SetupXML(); map<string,any > toSerialise = $[]; - toSerialise = add(toSerialise,"software",software); + toSerialise = add(toSerialise,"software",makeXMLFriendly(software)); toSerialise = add(toSerialise,"repositories",makeXMLFriendly(repositories)); toSerialise = add(toSerialise,"remainSubscribed",remainSubscribed); toSerialise = add(toSerialise,"name",name); @@ -775,7 +775,7 @@ { SetupXML(); map<string,any> deSerialised = (map<string,any >)XML::XMLToYCPFile(filename); - software = deSerialised["software"]:$[]; + software = fromXMLFriendly((list<map<string,string> >)deSerialised["software"]:[]); repositories = fromXMLFriendly((list<map<string,string> >)deSerialised["repositories"]:[]); remainSubscribed = deSerialised["remainSubscribed"]:false; summary = deSerialised["summary"]:""; Modified: trunk/metapackage/src/OneClickInstallWorkerResponse.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallW… ============================================================================== --- trunk/metapackage/src/OneClickInstallWorkerResponse.ycp (original) +++ trunk/metapackage/src/OneClickInstallWorkerResponse.ycp Wed Oct 31 11:40:03 2007 @@ -5,7 +5,7 @@ import "XML"; string DEFAULT_FAILURE_STAGE = _("unknown"); - string DEFAULT_ERROR_MESSAGE = _("An unknown error occurred."); + string DEFAULT_ERROR_MESSAGE = _("Administrator (root) privileges are required, either they were not supplied or an unknown error occurred."); string DEFAULT_NOTE = ""; string success = "false"; string note = DEFAULT_NOTE; -- 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] r41663 - /branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc
by gs＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: gs Date: Wed Oct 31 11:30:42 2007 New Revision: 41663 URL: http://svn.opensuse.org/viewcvs/yast?rev=41663&view=rev Log: remove NCSpacings Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Wed Oct 31 11:30:42 2007 @@ -141,8 +141,6 @@ new NCLabel( split, headline, true, false ); // isHeading = true - new NCSpacing( split, YD_VERT, false, 0.4 ); - NCFrame * frame = new NCFrame( split, "" ); // label for text field showing the selected dir @@ -160,7 +158,6 @@ detailed = new NCCheckBox( hSplit, _( "&Detailed View" ), false ); YStringWidgetID * detailsID = new YStringWidgetID( idDetails ); detailed->setId( detailsID ); - new NCSpacing( hSplit, YD_HORIZ, true, 0.1 ); // stretchable = true // HBox for the lists NCLayoutBox * hSplit1 = new NCLayoutBox( split, YD_HORIZ ); @@ -217,13 +214,11 @@ extension->addItem( filter, true ); // selected - new NCSpacing( split, YD_VERT, false, 0.8 ); + new NCSpacing( split, YD_VERT, false, 1.0 ); // HBox for the buttons NCLayoutBox * hSplit3 = new NCLayoutBox( split, YD_HORIZ ); - new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); - // add the OK button okButton = new NCPushButton( hSplit3, _( "&OK" ) ); okButton->setFunctionKey( 10 ); @@ -232,8 +227,6 @@ YStringWidgetID * okID = new YStringWidgetID( idOk ); okButton->setId( okID ); - new NCSpacing( hSplit3, YD_HORIZ, true, 0.4 ); - // add the Cancel button cancelButton = new NCPushButton( hSplit3, _( "&Cancel" ) ); cancelButton->setFunctionKey( 9 ); @@ -242,8 +235,6 @@ YStringWidgetID * cancelID = new YStringWidgetID( idCancel ); cancelButton->setId( cancelID ); - new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); - } /////////////////////////////////////////////////////////////////// -- 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] r41662 - /tags/stable-2_16_1/online-update/
by jsuchome＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: jsuchome Date: Wed Oct 31 11:23:23 2007 New Revision: 41662 URL: http://svn.opensuse.org/viewcvs/yast?rev=41662&view=rev Log: Created tag stable-2_16_1 for online-update Added: tags/stable-2_16_1/online-update/ - copied from r41661, trunk/online-update/ -- 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] r41661 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/AutoOnlineUpdate.ycp
by jsuchome＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: jsuchome Date: Wed Oct 31 11:23:17 2007 New Revision: 41661 URL: http://svn.opensuse.org/viewcvs/yast?rev=41661&view=rev Log: - use --quiet option for zypper in cron job (#335305) - 2.16.1 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/AutoOnlineUpdate.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=41661&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Wed Oct 31 11:23:17 2007 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Wed Oct 31 11:23:17 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 31 09:23:13 CET 2007 - jsuchome(a)suse.cz + +- use --quiet option for zypper in cron job (#335305) +- 2.16.1 + +------------------------------------------------------------------- Wed Oct 10 14:37:12 CEST 2007 - jsuchome(a)suse.cz - do not log progress on DoneDownload callback (#331271) Modified: trunk/online-update/src/AutoOnlineUpdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/AutoOnlineUpda… ============================================================================== --- trunk/online-update/src/AutoOnlineUpdate.ycp (original) +++ trunk/online-update/src/AutoOnlineUpdate.ycp Wed Oct 31 11:23:17 2007 @@ -192,12 +192,12 @@ if (timing == `weekly && day >= 0 && day <= 7) { - cronjob = sformat( "%1 %2 * * %3 root %4 up -y -t patch %5", + cronjob = sformat( "%1 %2 * * %3 root %4 up -y --quiet -t patch %5", minute, hour, day, updater, options); } else { - cronjob = sformat ("%1 %2 * * * root %3 up -y -t patch %4", + cronjob = sformat ("%1 %2 * * * root %3 up -y --quiet -t patch %4", minute, hour, updater, options); } // if ( autoget ) cronjob = cronjob + " -d"; -- 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] r41660 - /branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc
by gs＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: gs Date: Wed Oct 31 11:20:34 2007 New Revision: 41660 URL: http://svn.opensuse.org/viewcvs/yast?rev=41660&view=rev Log: setSendKeyEvents( true ) for file/dirlist Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Wed Oct 31 11:20:34 2007 @@ -132,9 +132,6 @@ const string & headline, bool edit ) { - // FIXME - check all option settings - - YWidgetOpt opt; string startDir; startDir = checkIniDir( iniDir ); @@ -142,24 +139,12 @@ // the vertical split is the (only) child of the dialog NCLayoutBox * split = new NCLayoutBox( this, YD_VERT ); - // addChild() id obsolete (handled by new libyui) - - opt.notifyMode.setValue( false ); - - //the headline - //opt.isHeading.setValue( true ); - new NCLabel( split, headline, true, false ); // isHeading = true new NCSpacing( split, YD_VERT, false, 0.4 ); - opt.isHStretchable.setValue( true ); - NCFrame * frame = new NCFrame( split, "" ); - //NCLayoutBox * vSplit = new NCLayoutBox( frame, YD_VERT ); - opt.isEditable.setValue( false ); - opt.notifyMode.setValue( true ); // label for text field showing the selected dir dirName = new NCComboBox( frame, _( "Selected Directory:" ), false ); // editable = false; dirName->setNotify( true ); @@ -168,8 +153,6 @@ YStringWidgetID * dirID = new YStringWidgetID( idDirName ); dirName->setId( dirID ); - //new NCSpacing( vSplit, YD_VERT, false, 0.6 ); - // add the checkBox detailed NCLayoutBox * hSplit = new NCLayoutBox( split, YD_HORIZ ); @@ -188,12 +171,12 @@ dirHeader->addColumn( _("Directory name") ); // add the list of directories - opt.keyEvents.setValue( true ); dirList = new NCDirectoryTable( hSplit1, dirHeader, NCFileSelection::T_Overview, YCPString(startDir) ); - + dirList->setSendKeyEvents( true ); + YStringWidgetID * dirListID = new YStringWidgetID( idDirList ); dirList->setId( dirListID ); @@ -209,27 +192,24 @@ filter, YCPString(startDir) ); + fileList->setSendKeyEvents( true ); YStringWidgetID * dirFileID = new YStringWidgetID( idFileList ); fileList->setId( dirFileID ); - - opt.notifyMode.setValue( false ); - opt.keyEvents.setValue( false ); - NCLayoutBox * hSplit2 = new NCLayoutBox( split, YD_HORIZ ); + // opt.isEditable.setValue( edit ); + // the NCInputField doesn't support mode editable/not editable any longer + // FIXME or let it like it is ???? + // add the text entry for the file name - opt.isEditable.setValue( edit ); // FIXME fileName = new NCInputField( hSplit2, // label for text field showing the filename _( "&File name:" ), - false, + false, // passWordMode = false 100, - 50 ); // passWordMode = false + 50 ); fileName->setValue( iniFileName ); - fileName->setInputMaxLength( 100 ); - // FIXME - // fileName->setMaxFld( 50); // label for text field showing the filter (e.g. *.bak) NCComboBox * extension = new NCComboBox( hSplit2, _( "Filter:" ), edit ); // editable as set in edit @@ -237,32 +217,27 @@ extension->addItem( filter, true ); // selected - //split->addChild( new NCSpacing( split, opt, 0.8, false, true ) ); new NCSpacing( split, YD_VERT, false, 0.8 ); // HBox for the buttons NCLayoutBox * hSplit3 = new NCLayoutBox( split, YD_HORIZ ); - opt.isHStretchable.setValue( true ); - //hSplit3->addChild( new NCSpacing( hSplit3, opt, 0.2, true, false ) ); new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); - opt.key_Fxx.setValue( 10 ); // see okButton - // add the OK button okButton = new NCPushButton( hSplit3, _( "&OK" ) ); okButton->setFunctionKey( 10 ); + okButton->setStretchable( YD_HORIZ, true ); YStringWidgetID * okID = new YStringWidgetID( idOk ); okButton->setId( okID ); new NCSpacing( hSplit3, YD_HORIZ, true, 0.4 ); - opt.key_Fxx.setValue( 9 ); // see cancelButton - // add the Cancel button cancelButton = new NCPushButton( hSplit3, _( "&Cancel" ) ); cancelButton->setFunctionKey( 9 ); + cancelButton->setStretchable( YD_HORIZ, true ); YStringWidgetID * cancelID = new YStringWidgetID( idCancel ); cancelButton->setId( cancelID ); -- 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] r41659 - /branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc
by gs＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: gs Date: Wed Oct 31 10:41:11 2007 New Revision: 41659 URL: http://svn.opensuse.org/viewcvs/yast?rev=41659&view=rev Log: check keepSorting() correctly in getCurrentItem() Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc Wed Oct 31 10:41:11 2007 @@ -177,7 +177,6 @@ } _header[ col ] = NCstring( s ); - //YTable::setAlignment( col, al ); } /////////////////////////////////////////////////////////////////// @@ -255,7 +254,7 @@ { if ( !myPad()->Lines() ) return -1; - return ( ! keepSorting() ) ? myPad()->GetLine( myPad()->CurPos().L )->getIndex () + return keepSorting() ? myPad()->GetLine( myPad()->CurPos().L )->getIndex () : myPad()->CurPos().L; } -- 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] r41658 - in /trunk/python-bindings/src: Makefile.am YCP.cc YCPDeclarations.cc YCPDeclarations.h YCPTypes/Code.cc YCPTypes/Term.cc YCPTypes/YCPTypesInternal.cc YPython.cc YPythonNamespace.cc
by juhliarik＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: juhliarik Date: Wed Oct 31 10:12:50 2007 New Revision: 41658 URL: http://svn.opensuse.org/viewcvs/yast?rev=41658&view=rev Log: -deleted temporary part of code (testing additional parts) Modified: trunk/python-bindings/src/Makefile.am trunk/python-bindings/src/YCP.cc trunk/python-bindings/src/YCPDeclarations.cc trunk/python-bindings/src/YCPDeclarations.h trunk/python-bindings/src/YCPTypes/Code.cc trunk/python-bindings/src/YCPTypes/Term.cc trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc trunk/python-bindings/src/YPython.cc trunk/python-bindings/src/YPythonNamespace.cc Modified: trunk/python-bindings/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/Makefile.am?… ============================================================================== --- trunk/python-bindings/src/Makefile.am (original) +++ trunk/python-bindings/src/Makefile.am Wed Oct 31 10:12:50 2007 @@ -30,9 +30,7 @@ libYCP_la_SOURCES = \ $(liby2lang_python_la_SOURCES) \ YCP.cc \ - PythonLogger.cc PythonLogger.h \ - YPythonNamespace.cc YPythonNamespace.h \ - YCPDeclarations.cc YCPDeclarations. + PythonLogger.cc PythonLogger.h @@ -54,6 +52,8 @@ -lycp -ly2 \ -Xlinker --no-whole-archive \ -ly2util \ + -ly2 \ + -lYCPDeclarations \ -version-info 2:0 libYCP_la_LIBADD = libYCPTypes.la #libYCPDeclarations.la Modified: trunk/python-bindings/src/YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCP.cc?rev=4… ============================================================================== --- trunk/python-bindings/src/YCP.cc (original) +++ trunk/python-bindings/src/YCP.cc Wed Oct 31 10:12:50 2007 @@ -43,8 +43,6 @@ PyObject * SCR_Run (const char *scr_command, PyObject *args); -PyObject * Py_ycp_code(PyObject *args); - void Py_y2logger(PyObject *args); void init_wfm (); @@ -129,12 +127,14 @@ return Py_None; } +/* static PyObject * ycp_code (PyObject *self, PyObject *args) { Py_ycp_code(args); return Py_None; } +*/ /** * This is needed for importing new module from ycp. @@ -154,7 +154,6 @@ {"SCR_Execute", ycp_scr_execute, METH_VARARGS, "SCR Execute function"}, {"SCR_Dir", ycp_scr_dir, METH_VARARGS, "SCR Dir function"}, {"y2logger", ycp_y2logger, METH_VARARGS, "Logging error, debug messages and milestones in python"}, - {"ycp_code", ycp_code, METH_VARARGS, "Convert Python function call to YCP Code"}, {NULL, NULL, 0, NULL} /* Sentinel */ }; @@ -349,40 +348,6 @@ } -PyObject * Py_ycp_code(PyObject *args) { - - Parser *parser; - PyObject *temp; - string command; - YCodePtr c = 0; - - temp = PyTuple_GetItem(args, 0); - - if (PyString_Check(temp)) - command = PyString_AsString(temp); - else - command = ""; - cout << command << endl; - parser = new Parser(command.c_str()); - - //parser->setInput(command.c_str()); - //parser->setBuffered(); - c = parser->parse(); - - if (c) - c->evaluate(); - else - cout << "eee c nejde!" << endl; - - cout << c->toString() << endl; - - delete(parser); - - return Py_None; - -} - - PyObject * Import_YCPNameSpace (PyObject *args) { PyObject* pResult = PyBool_FromLong(0); Modified: trunk/python-bindings/src/YCPDeclarations.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPDeclarati… ============================================================================== --- trunk/python-bindings/src/YCPDeclarations.cc (original) +++ trunk/python-bindings/src/YCPDeclarations.cc Wed Oct 31 10:12:50 2007 @@ -2,10 +2,10 @@ #include <iostream> using std::string; using std::vector; -//#define DBG(str) \ +#define DBG(str) \ std::cerr << __FILE__ << ": " << __LINE__ << ": " << str << std::endl; \ std::cerr.flush() -#define DBG(str) +//#define DBG(str) /********** STATIC MEMBERS **********/ @@ -172,8 +172,9 @@ YCPDeclarations::~YCPDeclarations() { + DBG("YCPDeclarations - destructor"); - + int cache_len = _cache.size(); for (int i=0; i < cache_len; i++){ delete _cache[i]; @@ -181,6 +182,8 @@ if (_py_self != NULL) Py_DECREF(_py_self); + + //_instance = std::auto_ptr<YCPDeclarations>(NULL); } Modified: trunk/python-bindings/src/YCPDeclarations.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPDeclarati… ============================================================================== --- trunk/python-bindings/src/YCPDeclarations.h (original) +++ trunk/python-bindings/src/YCPDeclarations.h Wed Oct 31 10:12:50 2007 @@ -49,13 +49,13 @@ std::vector<cache_function_t *> _cache; - /** * Private construct. * Call YCPDeclarations::instance() to get pointer to YCPDeclarations * object. */ YCPDeclarations(); + /** * Return item from function map which has key key. Modified: trunk/python-bindings/src/YCPTypes/Code.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/Cod… ============================================================================== --- trunk/python-bindings/src/YCPTypes/Code.cc (original) +++ trunk/python-bindings/src/YCPTypes/Code.cc Wed Oct 31 10:12:50 2007 @@ -23,7 +23,7 @@ if (self != NULL){ self->value = Py_None; if (self->value == NULL){ - Py_DECREF(self); + Py_XDECREF(self); return NULL; } Modified: trunk/python-bindings/src/YCPTypes/Term.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/Ter… ============================================================================== --- trunk/python-bindings/src/YCPTypes/Term.cc (original) +++ trunk/python-bindings/src/YCPTypes/Term.cc Wed Oct 31 10:12:50 2007 @@ -23,12 +23,12 @@ if (self != NULL){ self->name = PyString_FromString(""); if (self->name == NULL){ - Py_DECREF(self); + Py_XDECREF(self); return NULL; } self->value = PyTuple_New(0); if (self->value == NULL){ - Py_DECREF(self); + Py_XDECREF(self); return NULL; } Modified: trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/YCP… ============================================================================== --- trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc (original) +++ trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc Wed Oct 31 10:12:50 2007 @@ -16,7 +16,7 @@ if (self != NULL){ self->value = PyString_FromString(""); if (self->value == NULL){ - Py_DECREF(self); + Py_XDECREF(self); return NULL; } @@ -65,7 +65,7 @@ Py_INCREF(value); if (PyTuple_SetItem(args, 0, value) != 0){ Py_XDECREF(args); - Py_DECREF(value); + Py_XDECREF(value); } // create new Path object Modified: trunk/python-bindings/src/YPython.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPython.cc?r… ============================================================================== --- trunk/python-bindings/src/YPython.cc (original) +++ trunk/python-bindings/src/YPython.cc Wed Oct 31 10:12:50 2007 @@ -129,29 +129,20 @@ module_name = module.substr(found+1); //delete last 3 chars from module name ".py" module_name.erase(module_name.size()-3); //delete ".py" - //initialize python and set the path where are python modules - cout << "Searching path for modules: " << Py_GetPath()<< endl; + //initialize python and set the path where are python modules if (!Py_IsInitialized()) { - cout <<"path :" << path << endl; - setenv("PYTHONPATH", path.c_str(), 1); - + setenv("PYTHONPATH", path.c_str(), 1); Py_Initialize(); YPython::_pMainDicts = PyDict_New(); } - setenv("PYTHONPATH", path.c_str(), 1); - cout <<"path :" << path << endl; if (!YPython::_pMainDicts) YPython::_pMainDicts = PyDict_New(); //create python string for name of module pModuleName = PyString_FromString(module_name.c_str()); //check if dictionary contain "dictionary" for module if ( PyDict_Contains(YPython::_pMainDicts, pModuleName) == 0) { - cout <<"loadModule name: " << module_name << endl; - //char * new_path = (char *) path.c_str(); - //PySys_SetPath(new_path); - cout << "Searching path for modules after init: " << Py_GetPath()<< endl; pMain = PyImport_ImportModule(module_name.c_str()); if (pMain == NULL){ y2error("Can't import module %s", module_name.c_str()); @@ -628,10 +619,9 @@ char *fun_name = PyString_AsString(((PyCodeObject *) fun_code)->co_name); string file_path = PyString_AsString(((PyCodeObject *) fun_code)->co_filename); - //Y2Namespace* name_space = new Y2Namespace(); - printf ("meno funckie %s\n", fun_name); - printf ("meno suboru %s\n", file_path.c_str()); + //printf ("meno funckie %s\n", fun_name); + //printf ("meno suboru %s\n", file_path.c_str()); //found last "/" in path size_t found = file_path.find_last_of("/"); @@ -650,16 +640,17 @@ y2error("Finding file where is function %s failed", fun_name); return YCPNull(); } + + //found last "/" in path + found = file_path.find_last_of("/"); + string path = file_path.substr(0,found+1); + setenv("PYTHONPATH", path.c_str(), 1); YPython::loadModule (file_path); - - //found last "/" in path - found = file_path.find_last_of("/"); //extract module name from path - module_name = file_path.substr(found+1); //delete last 3 chars from module name ".py" @@ -668,7 +659,6 @@ //found last "/" in path Y2Namespace *ns = new YPythonNamespace (module_name); - if (ns) { TableEntry *sym_te = ns->table ()->find (fun_name); if (sym_te == NULL) { @@ -676,7 +666,7 @@ return YCPNull(); } SymbolEntryPtr sym_entry = sym_te->sentry(); - cout << "entry" << sym_entry->toString()<< endl; + //cout << "entry" << sym_entry->toString()<< endl; return YCPReference(sym_entry); } else { Modified: trunk/python-bindings/src/YPythonNamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPythonNames… ============================================================================== --- trunk/python-bindings/src/YPythonNamespace.cc (original) +++ trunk/python-bindings/src/YPythonNamespace.cc Wed Oct 31 10:12:50 2007 @@ -155,6 +155,7 @@ //Declarations (using YPCDelcarations python module) YCPDeclarations *decl = YCPDeclarations::instance(); + FunctionTypePtr sym_tp; std::vector<constTypePtr> list_of_types; int tmp; @@ -171,7 +172,6 @@ return; } - //keys from dictionary fun_names = PyDict_Keys(pMainDict); @@ -191,7 +191,8 @@ fun_code = PyFunction_GetCode(pFunc); num = ((PyCodeObject *) fun_code)->co_argcount; - if (decl->exists((PyFunctionObject *)pFunc) + + if (decl->exists((PyFunctionObject *)pFunc) && decl->numParams((PyFunctionObject *)pFunc) == num){ sym_tp = new FunctionType(decl->returnType((PyFunctionObject *)pFunc)); @@ -222,13 +223,16 @@ // enter it to the symbol table enterSymbol (fun_se, 0); } - } // end of for (int i = 0; i < num_fun_names; i++) + } // end of for (int i = 0; i < num_fun_names; i++) + y2milestone ("YPythonNamespace finish"); } YPythonNamespace::~YPythonNamespace () { + + } const string YPythonNamespace::filename () const -- 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] r41657 - /tags/branch-SLE-10-SP1-2_13_26/add-on-creator/
by jsuchome＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: jsuchome Date: Tue Oct 30 22:26:16 2007 New Revision: 41657 URL: http://svn.opensuse.org/viewcvs/yast?rev=41657&view=rev Log: Created tag branch-SLE-10-SP1-2_13_26 for add-on-creator Added: tags/branch-SLE-10-SP1-2_13_26/add-on-creator/ - copied from r41656, 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] r41656 - 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 30 Oct '07

30 Oct '07

Author: jsuchome Date: Tue Oct 30 22:22:28 2007 New Revision: 41656 URL: http://svn.opensuse.org/viewcvs/yast?rev=41656&view=rev Log: - create patterns with correct key ordering (#328816) - after pattern import, show also keys without value (#329738) - 2.13.26 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 Tue Oct 30 22:22:28 2007 @@ -1 +1 @@ -2.13.25 +2.13.26 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 Tue Oct 30 22:22:28 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 30 22:16:18 CET 2007 - jsuchome(a)suse.cz + +- create patterns with correct key ordering (#328816) +- after pattern import, show also keys without value (#329738) +- 2.13.26 + +------------------------------------------------------------------- Wed Sep 5 12:53:26 CEST 2007 - jsuchome(a)suse.cz - enable deleting of pattern keys (#297195) 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 Tue Oct 30 22:22:28 2007 @@ -259,7 +259,7 @@ // desctiption of pattern keys -global map pattern_descr = $[ +global map<string,map> pattern_descr = $[ "name" : $[ "internal" : true, ], @@ -812,6 +812,15 @@ else ret[key] = val; }); + foreach (string key, map descr, pattern_descr, { + if (!haskey (ret, key) && !descr["internal"]:false) + { + y2debug ("adding empty key '%1'...", key); + // do not add default values - maybe imported pattern + // ignored them intentionally + ret[key] = ""; + } + }); return ret; } @@ -1412,7 +1421,10 @@ if (filename == "") return; names = add (names, filename); - string file = ""; + string file = sformat ("=Ver: %1\n\n=Pat: %2\n", + pattern["Ver"]:pattern_descr["Ver","defval"]:"", + pattern["Pat"]:""); + pattern = remove (remove (pattern, "Ver"), "Pat"); foreach (string key, any val, (map<string,any>) pattern, { map descr = pattern_descr[key]:$[]; // substring (key,0,3) is because of Des.lang, Sum.lang and Cat.lang -- 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] r41655 - in /trunk/gtk: ChangeLog src/YGDialog.cc src/ygtkmenubutton.c
by rpmcruz＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: rpmcruz Date: Tue Oct 30 18:58:45 2007 New Revision: 41655 URL: http://svn.opensuse.org/viewcvs/yast?rev=41655&view=rev Log: * src/ygtkmenubutton.c: simplified menu pos code. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDialog.cc trunk/gtk/src/ygtkmenubutton.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41655&r1=41654… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Oct 30 18:58:45 2007 @@ -1,3 +1,7 @@ +2007-10-31 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkmenubutton.c: simplified menu pos code. + 2007-10-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGProgressBar.cc: improved look of the multi-progress-bar. Made Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=41655&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Tue Oct 30 18:58:45 2007 @@ -191,11 +191,11 @@ if (parent) { // if there is a parent, this would be a dialog - gtk_window_set_transient_for (window, parent); gtk_window_set_title (window, ""); - gtk_window_set_modal (window, TRUE); + gtk_window_set_transient_for (window, parent); gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DIALOG); + //gtk_window_set_focus_on_map (window, FALSE); } else { gtk_window_set_title (window, "YaST"); Modified: trunk/gtk/src/ygtkmenubutton.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkmenubutton.c?rev=416… ============================================================================== --- trunk/gtk/src/ygtkmenubutton.c (original) +++ trunk/gtk/src/ygtkmenubutton.c Tue Oct 30 18:58:45 2007 @@ -141,46 +141,11 @@ static void ygtk_menu_button_get_menu_pos (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer pointer) { - // Based on code from GtkComboBox GtkWidget *widget = (GtkWidget*) pointer; - gint sx, sy; - GtkRequisition req; - - gdk_window_get_origin (widget->window, &sx, &sy); - - if (GTK_WIDGET_NO_WINDOW (widget)) { - sx += widget->allocation.x; - sy += widget->allocation.y; - } - - gtk_widget_size_request (GTK_WIDGET (menu), &req); - - if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) - *x = sx; - else - *x = sx + widget->allocation.width - req.width; - *y = sy; - - GdkRectangle monitor; - GdkScreen *screen = gtk_widget_get_screen (widget); - int monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window); - gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); - - if (*x < monitor.x) - *x = monitor.x; - else if (*x + req.width > monitor.x + monitor.width) - *x = monitor.x + monitor.width - req.width; - - if (monitor.y + monitor.height - *y - widget->allocation.height >= req.height) - *y += widget->allocation.height; - else if (*y - monitor.y >= req.height) - *y -= req.height; - else if (monitor.y + monitor.height - *y - widget->allocation.height > *y - monitor.y) - *y += widget->allocation.height; - else - *y -= req.height; - - *push_in = FALSE; + gdk_window_get_origin (widget->window, x, y); + *x += widget->allocation.x; + *y += widget->allocation.y + widget->allocation.height; + *push_in = TRUE; } static void ygtk_menu_button_show_popup (YGtkMenuButton *button) -- 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] r41654 - /tags/stable-2_16_2/installation/
by locilka＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: locilka Date: Tue Oct 30 17:42:20 2007 New Revision: 41654 URL: http://svn.opensuse.org/viewcvs/yast?rev=41654&view=rev Log: Created tag stable-2_16_2 for installation Added: tags/stable-2_16_2/installation/ - copied from r41653, trunk/installation/ -- 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] r41653 - /tags/stable-2_16_3/yast2/
by locilka＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: locilka Date: Tue Oct 30 17:39:56 2007 New Revision: 41653 URL: http://svn.opensuse.org/viewcvs/yast?rev=41653&view=rev Log: Created tag stable-2_16_3 for yast2 Added: tags/stable-2_16_3/yast2/ - copied from r41652, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0