October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52545 - in /trunk/registration: VERSION package/yast2-registration.changes src/clients/inst_suse_register.ycp src/clients/suse_register_auto.ycp src/dialogs/texts.ycp src/modules/Register.ycp
by jdsn＠svn.opensuse.org 24 Oct '08

24 Oct '08

Author: jdsn Date: Fri Oct 24 23:41:43 2008 New Revision: 52545 URL: http://svn.opensuse.org/viewcvs/yast?rev=52545&view=rev Log: - checking if registration runs on xen (bnc#418287) - more verbose logging - 2.17.9 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/clients/inst_suse_register.ycp trunk/registration/src/clients/suse_register_auto.ycp trunk/registration/src/dialogs/texts.ycp trunk/registration/src/modules/Register.ycp Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=52545&r… ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Fri Oct 24 23:41:43 2008 @@ -1 +1 @@ -2.17.8 +2.17.9 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Fri Oct 24 23:41:43 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 24 23:06:02 CEST 2008 - jdsn(a)suse.de + +- checking if registration runs on xen (bnc#418287) +- more verbose logging +- 2.17.9 + +------------------------------------------------------------------- Mon Oct 20 19:15:42 CEST 2008 - jdsn(a)suse.de - activate autorefresh for new services Modified: trunk/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/inst_su… ============================================================================== --- trunk/registration/src/clients/inst_suse_register.ycp (original) +++ trunk/registration/src/clients/inst_suse_register.ycp Fri Oct 24 23:41:43 2008 @@ -49,6 +49,7 @@ CommandLine::Run($["id" : "registration", "help" : cmdhelp ]); + y2milestone("Registration was called with help parameter."); return `auto; } @@ -56,32 +57,20 @@ symbol confRegSrv = Register::configureRegistrationServer(); if (confRegSrv == `conferror || confRegSrv == `notrust || confRegSrv == `silentskip) { - y2debug("Registration can not be run due to SMT configuration error."); + y2error("Registration can not be run due to SMT configuration error."); return `auto; } // no network - no suse_register - if (!Mode::normal()) + if (!Mode::normal() && !Internet::suse_register) { - if (!Internet::suse_register) - { - Internet::do_you = false; - return `auto; - } - } - - - boolean IAMSLE = ( (integer) SCR::Execute(.target.bash, " [ -e /usr/share/applications/YaST2/customer_center.desktop ] ") == 0 ? true:false ); - - // error handling - skip if suseRegister is missing - integer sr_exist = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/suse_register"); - if (sr_exist != 0) - { - y2milestone("/usr/bin/suse_register does not exist - skipping registration"); + y2error("The internet test failed or was skipped. So registration will not run."); Internet::do_you = false; return `auto; } + boolean IAMSLE = ( (integer) SCR::Execute(.target.bash, " [ -e /usr/share/applications/YaST2/customer_center.desktop ] ") == 0 ? true:false ); + // Register::initialize() is mandatory - never remove it Register::initialize(); @@ -140,11 +129,14 @@ /* strings for success popup */ string nccc_success_msg = _("Your configuration was successful."); string nccc_success_server_added = _("An update server has been added to your configuration."); + nccc_success_server_added = TXT["reposUpdated_old"]:""; string nccc_error_no_server_added = _("No update server could be added to your configuration."); string nccc_no_source_changes0 = _("No software repository needed to be changed."); string nccc_no_source_changes = _("Software repositories did not need to be changed."); /* caption for details view */ - string success_detail_label =_("New Update Server"); + string success_detail_label_old = _("New Update Server"); + string success_detail_label_new = _("Updated software repositories"); + string success_detail_label = success_detail_label_new; /* strings for manual interaction popup */ string mi_required = _("Manual Interaction Required"); @@ -424,6 +416,8 @@ // function to display an error message // and offer a detailled view of the error message + y2error("Registration is reporting an error to the user: %1", error_msg_details); + UI::OpenDialog(error_message); UI::SetFocus (`id (`skip )); symbol retry = nil; @@ -527,7 +521,10 @@ if ( textmode ) { cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/w3m") == 0 ? true:false; - // screen is no longer needed as there is UI::RunInTerminal for textmode programs now (#367719) + if ( ! cmd_ok ) + { + y2error("Textmode installation requires w3m for interactive registration. w3m is missing."); + } bcmd = " w3m "; } else @@ -545,10 +542,21 @@ } } cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/xulrunner") == 0 ? true:false; + + if ( ! cmd_ok ) + { + y2error("Graphical installation requires Mozilla-xulrunner for interactive registration. Mozilla-xulrunner is missing."); + } + bcmd = " MOZ_DISABLE_PANGO=1 /usr/bin/xulrunner /usr/share/YaST2/yastbrowser/application.ini -url "; } - if (! cmd_ok) return "nobrowser"; + if (! cmd_ok) + { + y2error("No browser found for interactive registration."); + return "nobrowser"; + } + // add url to browser command bcmd = bcmd + "'" + url + "'"; @@ -569,24 +577,34 @@ boolean launchBrowser(string url) { + y2milestone("Just about to start a browser for manual interaction in registration."); // check for valid url map parsed = URL::Parse(url); - if ( parsed == $[]) return false; + if ( parsed == $[]) + { + y2error("The URL to open in the registration browser has an invalid format: %1", parsed); + return false; + } // no rebuild of the url - parser seems to only parse one parameter in URL string uri = String::FirstChunk(url, "\n"); // (#167225) // get command to run correct browser and execute it string command = browser_command(uri); - if (command == "nobrowser") return false; + if (command == "nobrowser") + { + y2error("Could not find a browser to display the registration website."); + return false; + } - y2milestone("launching browser: %1", command); if (textmode) { + y2milestone("Launching textmode browser with: %1", command); UI::RunInTerminal(command); } else { + y2milestone("Launching graphical borwser with: %1", command); SCR::Execute(.target.bash, command ); } @@ -598,6 +616,7 @@ boolean registrationServerSettings() { + y2milestone("Asking the user for custom registration server settings."); string curRegURL = Register::smt_server; if (curRegURL == nil) curRegURL = "https://"; string curRegCert = Register::smt_server_cert; @@ -637,11 +656,11 @@ curRegURL = (string) UI::QueryWidget(`id(`newRegistrationServer), `Value); curRegCert = (string) UI::QueryWidget(`id(`newRegistrationServerCert), `Value); - // FIXME TODO // check urls for sanity map parsed = URL::Parse(curRegURL); if (parsed == nil || parsed == $[] || parsed["scheme"]:"" != "https" ) { + y2error("The selected registration URL has an invalid format: %1", parsed); Popup::Message(TXT["urlHasToBeHttps"]:""); continue; } @@ -649,12 +668,12 @@ { Register::smt_server = curRegURL; Register::smt_server_cert = curRegCert; + y2milestone("New registration server: %1", curRegURL); + y2milestone("New registration server CA certificate location: %1", curRegCert); status=true; break; } - } - } UI::CloseDialog(); @@ -687,7 +706,7 @@ any ret = nil; integer SRstatus = nil; string manual_interaction_overview = ""; - + symbol xenType = nil; /* -------------------------------- PROGRAM LOGIC START ----------------------------------------------------------- */ @@ -715,7 +734,8 @@ Register::submit_hwdata = (boolean) UI::QueryWidget(`id(`hwinfo), `Value); Register::submit_optional= (boolean) UI::QueryWidget(`id(`optional), `Value); Register::force_registration = (boolean) UI::QueryWidget(`id(`forcereg), `Value); - Register::register_regularly = (boolean) UI::QueryWidget(`id(`regularly_run), `Value); + if ( IAMSLE ) + Register::register_regularly = (boolean) UI::QueryWidget(`id(`regularly_run), `Value); } else if (ret == `localRegistrationServer) { @@ -762,6 +782,60 @@ { if ( configure_status == true ) { + if ( IAMSLE && xenType == nil ) + { + // once checking for XEN (bnc#418287) + xenType = Register::xenType(); + + if ( xenType == `xen0 ) + { + string installPackage = "xen-tools"; + if ( ! Package::Installed(installPackage)) + { + y2milestone("Xen dom0 detected. Asking the user if the following packages should be installed: %1", installPackage); + Package::InstallMsg(installPackage, _("Xen Dom0 detected. The following package needs to be installed.")); + } + else + { + y2milestone("All needed packages are already installed: %1", installPackage); + } + } + else if ( xenType == `xenU ) + { + string installPackage = "xen-tools-domU"; + string removePackage = "xen-tools"; + + string xenDomU = _("Xen DomU detected."); + string installMsg = xenDomU + "\n" + _("The following package needs to be installed."); + string removeMsg = xenDomU + "\n" + + sformat(_("To count this installation correctly the package %1 needs to be installed."), installPackage ) + + "\n" + _("Therefore the following package needs to be removed first."); + + + Package::RemoveMsg(removePackage, removeMsg); + + if ( ! Package::Installed(removePackage) ) + { + if ( Package::InstallMsg(installPackage, installMsg ) ) + { y2milestone("Sucessfully installed: %1", installPackage); } + else + { y2error("Could not install: %1", installPackage); } + } + else + { + y2error("In a Xen DomU package %1 is installed rather than %2. Registration will continue nevertheless.", removePackage, installPackage); + Popup::Notify( xenDomU + "\n" + + sformat(_("The package %1 should have been installed and %2 removed."), installPackage, removePackage ) + + "\n" + _("Registration will continue now although the registration server may miscount this installation.") + ); + } + } + else if ( xenType == nil ) + { + y2error("Detecting XEN failed. Assuming XEN is disabled. Maybe the registration will not count this machine correctly."); + xenType = `unknown; + } + } // call suseRegister SRstatus = Register::suseRegister(nil); @@ -836,8 +910,8 @@ if (! browserrun ) { - // information_data = $["exit":"198", "stdout":"", "stderr":"" ]; - // FIXME - can this if clause be removed ?? + y2error("Registration can not finish with manual interaction because no webbrowser was found."); + Popup::Message(no_browser_msg); mi_loopend = true; } @@ -880,7 +954,7 @@ { string oldMessage = _("Setting up online update source..."); string newMessage = _("Updating software repositories..."); - UI::OpenDialog(`VBox(`Label( oldMessage ))); + UI::OpenDialog(`VBox(`Label( newMessage ))); // add/delete/change repositories repoSummary = Register::updateSoftwareRepositories(taskList, true); Modified: trunk/registration/src/clients/suse_register_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/suse_re… ============================================================================== --- trunk/registration/src/clients/suse_register_auto.ycp (original) +++ trunk/registration/src/clients/suse_register_auto.ycp Fri Oct 24 23:41:43 2008 @@ -112,7 +112,27 @@ map AutoPackages() { - return $[ "install":[], "remove":[] ]; + map retmap = $["install":[], "remove":[]]; + + symbol xenType = nil; + xenType = Register::xenType(); + + if ( xenType == `xen0 ) + { + retmap["install"] = add( retmap["install"]:[], "xen-tools" ); + } + else if ( xenType == `xenU ) + { + retmap["remove"] = add( retmap["remove"]:[], "xen-tools" ); + retmap["install"] = add( retmap["install"]:[], "xen-tools-domU" ); + } + else + { + y2milestone("XEN is disabled or could not be detected. No package changes will be applied."); + } + + y2milestone("Registration suggests the following package changes: %1", retmap); + return retmap; } Modified: trunk/registration/src/dialogs/texts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/dialogs/texts.y… ============================================================================== --- trunk/registration/src/dialogs/texts.ycp (original) +++ trunk/registration/src/dialogs/texts.ycp Fri Oct 24 23:41:43 2008 @@ -17,7 +17,9 @@ "mayTakeAWhile" : _("This may take a while"), "pleaseWait" : _("Please wait..."), "updatingSoftwareRepos" : _("Updating software repositories"), - "reposUpdated" : _("The software repositories have been updated.\nFind details in the Software Repositories module."), + "reposUpdated_old" : _("The software repositories have been updated.\nFind details in the Software Repositories module."), + "reposUpdated" : _("The software repositories have been updated."), + "findDetailsInRepoModule" : _("Find details in the Software Repositories module."), "noReposUpdated" : _("No software repositories have been updated."), "registrationWasSuccessful" : _("Registration was successful."), "defaultUpdateRepoRestored" : _("The default update repository has been restored."), Modified: trunk/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/Registe… ============================================================================== --- trunk/registration/src/modules/Register.ycp (original) +++ trunk/registration/src/modules/Register.ycp Fri Oct 24 23:41:43 2008 @@ -26,6 +26,7 @@ import "SourceManager"; import "Installation"; import "RegisterCert"; +import "Arch"; // -------------------------------------------------------------- // START: Locally defined data @@ -232,6 +233,43 @@ } +/* + * setupRegistrationServer() + * + * write SMT server settings to (FATE #302966) + * @return symbol that says if we can perform the registration + * + */ +global symbol xenType() +{ + y2milestone("Checking if this machine is a XEN instance or host."); + + if ( Arch::is_xen() ) + { + y2milestone("XEN enabled. Now detecting type."); + + if ( Arch::is_xen0() ) + { + y2milestone("Detected XEN0."); + return `xen0; + } + else if ( Arch::is_xenU() ) + { + y2milestone("Detected XENU"); + return `xenU; + } + } + else + { + y2milestone("XEN is disabled."); + return `noXen; + } + + y2error("An error occurred while detecting XEN. Assuming: XEN is disabled."); + return `unknown; +} + + /* * setupRegistrationServer() @@ -851,8 +889,6 @@ { read_config(); iamroot = amIroot(); - - // FIXME: need to test for xen-hypervisor status and install xen-packages } @@ -997,8 +1033,8 @@ list<string> summary = []; list<map> currentSources = Pkg::SourceEditGet(); - // log the sources for debugging purposes - FIXME - to be removed soon - y2milestone("The current sources are: %1", currentSources); + // log the sources for debugging purposes + // y2milestone("The current sources are: %1", currentSources); // outer foreach loop - loop over service names/aliases -- 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] r52544 - /tags/stable-2_16_7/vm/
by charlesa＠svn.opensuse.org 24 Oct '08

24 Oct '08

Author: charlesa Date: Fri Oct 24 22:27:31 2008 New Revision: 52544 URL: http://svn.opensuse.org/viewcvs/yast?rev=52544&view=rev Log: Created tag stable-2_16_7 for vm Added: tags/stable-2_16_7/vm/ - copied from r52543, trunk/vm/ -- 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] r52543 - /trunk/vm/src/VM_XEN.ycp
by charlesa＠svn.opensuse.org 24 Oct '08

24 Oct '08

Author: charlesa Date: Fri Oct 24 22:16:24 2008 New Revision: 52543 URL: http://svn.opensuse.org/viewcvs/yast?rev=52543&view=rev Log: bnc#436987 - More fixes to check for bridges. Add popup to query user. Modified: trunk/vm/src/VM_XEN.ycp Modified: trunk/vm/src/VM_XEN.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/VM_XEN.ycp?rev=52543&r1=5… ============================================================================== --- trunk/vm/src/VM_XEN.ycp (original) +++ trunk/vm/src/VM_XEN.ycp Fri Oct 24 22:16:24 2008 @@ -41,8 +41,11 @@ import "Report"; import "SuSEFirewall"; import "Wizard"; + import "Label"; + string net_path = "/sys/class/net/"; + global boolean ConfigureFirewall() { y2milestone("VM_XEN::ConfigureFirewall() started"); boolean ret = true; @@ -154,6 +157,9 @@ list progress_descriptions = []; + boolean bridge_exists = false; + string bridge_path = ""; + integer progress_length = size(progress_stages); // Headline for management domain installation @@ -189,6 +195,8 @@ boolean inst_gui = true; + y2milestone("VM_XEN::ConfigureDom0 Checking for packages..."); + // Assume python gtk is installed. If in text mode we don't care if (UI::GetDisplayInfo()["TextMode"]:true == true) { inst_gui = Popup::YesNo (_("Running in text mode. Install graphical components anyway?")); @@ -219,12 +227,31 @@ Progress::NextStage(); Progress::Title(_("Configuring Default Network Bridge...")); - { - y2milestone("Configuring default bridge for Xen..."); - WFM::call("lan_proposal", ["MakeProposal"]); - UI::OpenDialog(`VBox()); - WFM::call("lan_proposal", ["Write"]); - UI::CloseDialog(); + + // Check for the existance of /sys/class/net/*/bridge + list<string> interfaces = (list<string>)SCR::Read(.target.dir, net_path); + // foreach (map<string,any> i, interfaces, ``{ + foreach (string i, interfaces, ``{ + y2milestone("Checking for bridges..."); + bridge_path = net_path + "/" + i + "/bridge"; + if (SCR::Read(.target.dir, bridge_path) >= 0) { + y2milestone("Dom0 already has a configured bridge."); + bridge_exists = true; + break; + } + }); + + // Popup yes/no dialog + if ( bridge_exists == false ) { + if ( Popup::AnyQuestionRichText(_("Xen Network Bridge."), + _("For normal network configurations, xen needs a network bridge.Configure a default network bridge?"), + 45, 5, Label::YesButton(), Label::NoButton(), `focus_yes) ) { + y2milestone("Configuring default bridge for Xen..."); + WFM::call("lan_proposal", ["MakeProposal"]); + UI::OpenDialog(`VBox()); + WFM::call("lan_proposal", ["Write"]); + UI::CloseDialog(); + } } // Firewall stage - modify the firewall setting, add the xen bridge to FW_FORWARD_ALWAYS_INOUT_DEV -- 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] r52542 - in /trunk/gtk: ChangeLog src/yzypptags.cc src/yzypptags.h src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 24 Oct '08

24 Oct '08

Author: rpmcruz Date: Fri Oct 24 19:20:39 2008 New Revision: 52542 URL: http://svn.opensuse.org/viewcvs/yast?rev=52542&view=rev Log: * src/yzypptags.h/cc: sync groups with yast2-qt. Modified: trunk/gtk/ChangeLog trunk/gtk/src/yzypptags.cc trunk/gtk/src/yzypptags.h trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=52542&r1=52541… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Oct 24 19:20:39 2008 @@ -8,9 +8,11 @@ * src/yzyppwrapper.h/cc: added Package::support() and notifyMesage() interface in order to support ResObject::insnotify() and delnotify(). - * src/YGPackageSelector: added Support expander and honor + * src/YGPackageSelector.cc: added Support expander and honor notifyMessage(). + * src/yzypptags.h/cc: sync groups with yast2-qt. + 2008-10-23 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/yzyppwrapper.cc: bug fix 436948: recommended & suggested in Modified: trunk/gtk/src/yzypptags.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzypptags.cc?rev=52542&r… ============================================================================== --- trunk/gtk/src/yzypptags.cc (original) +++ trunk/gtk/src/yzypptags.cc Fri Oct 24 19:20:39 2008 @@ -22,269 +22,111 @@ const char * zypp_tag_group_enum_to_localised_text (YPkgGroupEnum group) { - const char *text = 0; switch (group) { - case PK_GROUP_ENUM_ACCESSIBILITY: - text = _("Accessibility"); - break; - case PK_GROUP_ENUM_ACCESSORIES: - text = _("Accessories"); - break; - case PK_GROUP_ENUM_EDUCATION: - text = _("Education"); - break; - case PK_GROUP_ENUM_GAMES: - text = _("Games"); - break; - case PK_GROUP_ENUM_GRAPHICS: - text = _("Graphics"); - break; - case PK_GROUP_ENUM_INTERNET: - text = _("Internet"); - break; - case PK_GROUP_ENUM_OFFICE: - text = _("Office"); - break; - case PK_GROUP_ENUM_OTHER: - text = _("Other"); - break; - case PK_GROUP_ENUM_PROGRAMMING: - text = _("Programming"); - break; - case PK_GROUP_ENUM_MULTIMEDIA: - text = _("Multimedia"); - break; - case PK_GROUP_ENUM_SYSTEM: - text = _("System"); - break; - case PK_GROUP_ENUM_DESKTOP_GNOME: - text = _("GNOME Desktop"); - break; - case PK_GROUP_ENUM_DESKTOP_KDE: - text = _("KDE Desktop"); - break; - case PK_GROUP_ENUM_DESKTOP_XFCE: - text = _("XFCE Desktop"); - break; - case PK_GROUP_ENUM_DESKTOP_OTHER: - text = _("Other Desktops"); - break; - case PK_GROUP_ENUM_PUBLISHING: - text = _("Publishing"); - break; - case PK_GROUP_ENUM_SERVERS: - text = _("Servers"); - break; - case PK_GROUP_ENUM_FONTS: - text = _("Fonts"); - break; - case PK_GROUP_ENUM_ADMIN_TOOLS: - text = _("Admin Tools"); - break; - case PK_GROUP_ENUM_LEGACY: - text = _("Legacy"); - break; - case PK_GROUP_ENUM_LOCALIZATION: - text = _("Localization"); - break; - case PK_GROUP_ENUM_VIRTUALIZATION: - text = _("Virtualization"); - break; - case PK_GROUP_ENUM_SECURITY: - text = _("Security"); - break; - case PK_GROUP_ENUM_POWER_MANAGEMENT: - text = _("Power Management"); - break; - case PK_GROUP_ENUM_COMMUNICATION: - text = _("Communication"); - break; - case PK_GROUP_ENUM_NETWORK: - text = _("Network"); - break; - case PK_GROUP_ENUM_MAPS: - text = _("Maps"); - break; - case PK_GROUP_ENUM_REPOS: - text = _("Software Sources"); - break; - case YPKG_GROUP_ALL: - text = _("All Packages"); - break; - - case YPKG_GROUP_SUGGESTED: - text = _("Suggested Packages"); - break; - - case YPKG_GROUP_RECOMMENDED: - text = _("Recommended Packages"); - break; - - case PK_GROUP_ENUM_UNKNOWN: - text = _("Unknown Group"); - break; - + case PK_GROUP_ENUM_ACCESSIBILITY: return _( "Accessibility" ); + case PK_GROUP_ENUM_ACCESSORIES: return _( "Accessories" ); + case PK_GROUP_ENUM_EDUCATION: return _( "Education" ); + case PK_GROUP_ENUM_GAMES: return _( "Games" ); + case PK_GROUP_ENUM_GRAPHICS: return _( "Graphics" ); + case PK_GROUP_ENUM_INTERNET: return _( "Internet" ); + case PK_GROUP_ENUM_OFFICE: return _( "Office" ); + case PK_GROUP_ENUM_OTHER: return _( "Other" ); + case PK_GROUP_ENUM_PROGRAMMING: return _( "Programming" ); + case PK_GROUP_ENUM_MULTIMEDIA: return _( "Multimedia" ); + case PK_GROUP_ENUM_SYSTEM: return _( "System" ); + case PK_GROUP_ENUM_DESKTOP_GNOME: return _( "GNOME Desktop" ); + case PK_GROUP_ENUM_DESKTOP_KDE: return _( "KDE Desktop" ); + case PK_GROUP_ENUM_DESKTOP_XFCE: return _( "XFCE Desktop" ); + case PK_GROUP_ENUM_DESKTOP_OTHER: return _( "Other Desktops" ); + case PK_GROUP_ENUM_PUBLISHING: return _( "Publishing" ); + case PK_GROUP_ENUM_SERVERS: return _( "Servers" ); + case PK_GROUP_ENUM_FONTS: return _( "Fonts" ); + case PK_GROUP_ENUM_ADMIN_TOOLS: return _( "Admin Tools" ); + case PK_GROUP_ENUM_LEGACY: return _( "Legacy" ); + case PK_GROUP_ENUM_LOCALIZATION: return _( "Localization" ); + case PK_GROUP_ENUM_VIRTUALIZATION: return _( "Virtualization" ); + case PK_GROUP_ENUM_SECURITY: return _( "Security" ); + case PK_GROUP_ENUM_POWER_MANAGEMENT: return _( "Power Management" ); + case PK_GROUP_ENUM_COMMUNICATION: return _( "Communication" ); + case PK_GROUP_ENUM_NETWORK: return _( "Network" ); + case PK_GROUP_ENUM_MAPS: return _( "Maps" ); + case PK_GROUP_ENUM_REPOS: return _( "Software Sources" ); + case PK_GROUP_ENUM_UNKNOWN: return _( "Unknown Group" ); } - return text; + return _("Unknown Group"); } const char * zypp_tag_enum_to_icon (YPkgGroupEnum group) { - const char *text; switch (group) { - case PK_GROUP_ENUM_ACCESSIBILITY: - text = "package_main"; - break; - case PK_GROUP_ENUM_ACCESSORIES: - text = "package_applications"; - break; - case PK_GROUP_ENUM_EDUCATION: - text = "package_edutainment"; - break; - case PK_GROUP_ENUM_GAMES: - text = "package_games"; - break; - case PK_GROUP_ENUM_GRAPHICS: - text = "package_graphics"; - break; - case PK_GROUP_ENUM_INTERNET: - text = "package_network"; - break; - case PK_GROUP_ENUM_OFFICE: - text = "applications-office"; - break; - case PK_GROUP_ENUM_OTHER: - text = "package_main"; - break; - case PK_GROUP_ENUM_PROGRAMMING: - text = "package_development"; - break; - case PK_GROUP_ENUM_MULTIMEDIA: - text = "package_multimedia"; - break; - case PK_GROUP_ENUM_SYSTEM: - text = "applications-system"; - break; - case PK_GROUP_ENUM_DESKTOP_GNOME: - text = "pattern-gnome"; - break; - case PK_GROUP_ENUM_DESKTOP_KDE: - text = "pattern-kde"; - break; - case PK_GROUP_ENUM_DESKTOP_XFCE: - text = "pattern-xfce"; - break; - case PK_GROUP_ENUM_DESKTOP_OTHER: - text = "user-desktop"; - break; - case PK_GROUP_ENUM_PUBLISHING: - text = "package_main"; - break; - case PK_GROUP_ENUM_SERVERS: - text = "package_editors"; - break; - case PK_GROUP_ENUM_FONTS: - text = "package_main"; - break; - case PK_GROUP_ENUM_ADMIN_TOOLS: - text = "yast-sysconfig"; - break; - case PK_GROUP_ENUM_LEGACY: - text = "package_main"; - break; - case PK_GROUP_ENUM_LOCALIZATION: - text = "yast-language"; - break; - case PK_GROUP_ENUM_VIRTUALIZATION: - text = "yast-create-new-vm"; - break; - case PK_GROUP_ENUM_SECURITY: - text = "yast-security"; - break; - case PK_GROUP_ENUM_POWER_MANAGEMENT: - text = "package_settings_power"; - break; - case PK_GROUP_ENUM_COMMUNICATION: - text = "yast-modem"; - break; - case PK_GROUP_ENUM_NETWORK: - text = "package_network"; - break; - case PK_GROUP_ENUM_MAPS: - text = "package_main"; - break; - case PK_GROUP_ENUM_REPOS: - text = "package_main"; - break; - case YPKG_GROUP_SUGGESTED: - case YPKG_GROUP_RECOMMENDED: - text = "package_edutainment_languages"; - - break; - case PK_GROUP_ENUM_UNKNOWN: - case YPKG_GROUP_ALL: - text = "package_main"; - break; - + case PK_GROUP_ENUM_ACCESSIBILITY: return( "package_main" ); + case PK_GROUP_ENUM_ACCESSORIES: return( "package_applications" ); + case PK_GROUP_ENUM_EDUCATION: return( "package_edutainment" ); + case PK_GROUP_ENUM_GAMES: return( "package_games" ); + case PK_GROUP_ENUM_GRAPHICS: return( "package_graphics" ); + case PK_GROUP_ENUM_INTERNET: return( "package_network" ); + case PK_GROUP_ENUM_OFFICE: return( "package_office_addressbook" ); + case PK_GROUP_ENUM_OTHER: return( "package_main" ); + case PK_GROUP_ENUM_PROGRAMMING: return( "package_development" ); + case PK_GROUP_ENUM_MULTIMEDIA: return( "package_multimedia" ); + case PK_GROUP_ENUM_SYSTEM: return( "yast-system" ); + case PK_GROUP_ENUM_DESKTOP_GNOME: return( "pattern-gnome" ); + case PK_GROUP_ENUM_DESKTOP_KDE: return( "pattern-kde" ); + case PK_GROUP_ENUM_DESKTOP_XFCE: return( "package_utility_desktop" ); + case PK_GROUP_ENUM_DESKTOP_OTHER: return( "package_utility_desktop" ); + case PK_GROUP_ENUM_PUBLISHING: return( "package_main" ); + case PK_GROUP_ENUM_SERVERS: return( "package_editors" ); + case PK_GROUP_ENUM_FONTS: return( "package_main" ); + case PK_GROUP_ENUM_ADMIN_TOOLS: return( "yast-sysconfig" ); + case PK_GROUP_ENUM_LEGACY: return( "package_main" ); + case PK_GROUP_ENUM_LOCALIZATION: return( "yast-language" ); + case PK_GROUP_ENUM_VIRTUALIZATION: return( "yast-create-new-vm" ); + case PK_GROUP_ENUM_SECURITY: return( "yast-security" ); + case PK_GROUP_ENUM_POWER_MANAGEMENT: return( "package_settings_power" ); + case PK_GROUP_ENUM_COMMUNICATION: return( "yast-modem" ); + case PK_GROUP_ENUM_NETWORK: return( "package_network" ); + case PK_GROUP_ENUM_MAPS: return( "package_main" ); + case PK_GROUP_ENUM_REPOS: return( "package_main" ); + case PK_GROUP_ENUM_UNKNOWN: return( "package_main" ); } - return text; + return ""; } YPkgGroupEnum zypp_tag_convert (const std::string &groupu) { - // TODO Look for a faster and nice way to do this conversion - std::string group = zypp::str::toLower(groupu); - if (group.find ("amusements") != std::string::npos) { - return PK_GROUP_ENUM_GAMES; - } else if (group.find ("development") != std::string::npos) { - return PK_GROUP_ENUM_PROGRAMMING; - } else if (group.find ("hardware") != std::string::npos) { - return PK_GROUP_ENUM_SYSTEM; - } else if (group.find ("archiving") != std::string::npos - || group.find("clustering") != std::string::npos - || group.find("system/monitoring") != std::string::npos - || group.find("databases") != std::string::npos - || group.find("system/management") != std::string::npos) { - return PK_GROUP_ENUM_ADMIN_TOOLS; - } else if (group.find ("graphics") != std::string::npos) { - return PK_GROUP_ENUM_GRAPHICS; - } else if (group.find ("multimedia") != std::string::npos) { - return PK_GROUP_ENUM_MULTIMEDIA; - } else if (group.find ("network") != std::string::npos) { - return PK_GROUP_ENUM_NETWORK; - } else if (group.find ("office") != std::string::npos - || group.find("text") != std::string::npos - || group.find("editors") != std::string::npos) { - return PK_GROUP_ENUM_OFFICE; - } else if (group.find ("publishing") != std::string::npos) { - return PK_GROUP_ENUM_PUBLISHING; - } else if (group.find ("security") != std::string::npos) { - return PK_GROUP_ENUM_SECURITY; - } else if (group.find ("telephony") != std::string::npos) { - return PK_GROUP_ENUM_COMMUNICATION; - } else if (group.find ("gnome") != std::string::npos) { - return PK_GROUP_ENUM_DESKTOP_GNOME; - } else if (group.find ("kde") != std::string::npos) { - return PK_GROUP_ENUM_DESKTOP_KDE; - } else if (group.find ("xfce") != std::string::npos) { - return PK_GROUP_ENUM_DESKTOP_XFCE; - } else if (group.find ("gui/other") != std::string::npos) { - return PK_GROUP_ENUM_DESKTOP_OTHER; - } else if (group.find ("localization") != std::string::npos) { - return PK_GROUP_ENUM_LOCALIZATION; - } else if (group.find ("system") != std::string::npos) { - return PK_GROUP_ENUM_SYSTEM; - } else if (group.find ("scientific") != std::string::npos) { - return PK_GROUP_ENUM_EDUCATION; - } - + if ( group.find( "amusements/teaching" ) != string::npos ) return PK_GROUP_ENUM_EDUCATION; + if ( group.find( "amusements" ) != string::npos ) return PK_GROUP_ENUM_GAMES; + if ( group.find( "development" ) != string::npos ) return PK_GROUP_ENUM_PROGRAMMING; + if ( group.find( "hardware" ) != string::npos ) return PK_GROUP_ENUM_SYSTEM; + if ( group.find( "archiving" ) != string::npos ) return PK_GROUP_ENUM_ADMIN_TOOLS; + if ( group.find( "clustering" ) != string::npos ) return PK_GROUP_ENUM_ADMIN_TOOLS; + if ( group.find( "system/monitoring" ) != string::npos ) return PK_GROUP_ENUM_ADMIN_TOOLS; + if ( group.find( "databases" ) != string::npos ) return PK_GROUP_ENUM_ADMIN_TOOLS; + if ( group.find( "system/management" ) != string::npos ) return PK_GROUP_ENUM_ADMIN_TOOLS; + if ( group.find( "graphics" ) != string::npos ) return PK_GROUP_ENUM_GRAPHICS; + if ( group.find( "multimedia" ) != string::npos ) return PK_GROUP_ENUM_MULTIMEDIA; + if ( group.find( "network" ) != string::npos ) return PK_GROUP_ENUM_NETWORK; + if ( group.find( "office" ) != string::npos ) return PK_GROUP_ENUM_OFFICE; + if ( group.find( "text" ) != string::npos ) return PK_GROUP_ENUM_OFFICE; + if ( group.find( "editors" ) != string::npos ) return PK_GROUP_ENUM_OFFICE; + if ( group.find( "publishing" ) != string::npos ) return PK_GROUP_ENUM_PUBLISHING; + if ( group.find( "security" ) != string::npos ) return PK_GROUP_ENUM_SECURITY; + if ( group.find( "telephony" ) != string::npos ) return PK_GROUP_ENUM_COMMUNICATION; + if ( group.find( "gnome" ) != string::npos ) return PK_GROUP_ENUM_DESKTOP_GNOME; + if ( group.find( "kde" ) != string::npos ) return PK_GROUP_ENUM_DESKTOP_KDE; + if ( group.find( "xfce" ) != string::npos ) return PK_GROUP_ENUM_DESKTOP_XFCE; + if ( group.find( "gui/other" ) != string::npos ) return PK_GROUP_ENUM_DESKTOP_OTHER; + if ( group.find( "localization" ) != string::npos ) return PK_GROUP_ENUM_LOCALIZATION; + if ( group.find( "system" ) != string::npos ) return PK_GROUP_ENUM_SYSTEM; + if ( group.find( "scientific" ) != string::npos ) return PK_GROUP_ENUM_EDUCATION; + return PK_GROUP_ENUM_UNKNOWN; } Modified: trunk/gtk/src/yzypptags.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzypptags.h?rev=52542&r1… ============================================================================== --- trunk/gtk/src/yzypptags.h (original) +++ trunk/gtk/src/yzypptags.h Fri Oct 24 19:20:39 2008 @@ -37,10 +37,6 @@ PK_GROUP_ENUM_MAPS, PK_GROUP_ENUM_REPOS, PK_GROUP_ENUM_UNKNOWN, - /* Other values */ - YPKG_GROUP_SUGGESTED, - YPKG_GROUP_RECOMMENDED, - YPKG_GROUP_ALL, } YPkgGroupEnum; Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=5254… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Fri Oct 24 19:20:39 2008 @@ -428,7 +428,7 @@ } if (!isInstalled() && (isRecommended() || isSuggested())) { - text += ""; + text += ""; if (isRecommended()) text += _("(As this package is an extension to an already installed package, it is recommended it be installed.)"); if (isSuggested()) @@ -629,12 +629,12 @@ } if (rich) { - if (!vendor.empty()) - text += _("Vendor:") + ("<blockquote>" + vendor) + "</blockquote>"; if (!authors.empty()) text += _("Developed by:") + ("<blockquote>" + authors) + "</blockquote>"; if (!packager.empty()) text += _("Packaged by:") + ("<blockquote>" + packager) + "</blockquote>"; + if (!vendor.empty() && !text.empty() /*doesn't make much sense alone*/) + text += _("Vendor:") + ("<blockquote>" + vendor) + "</blockquote>"; } else return authors; -- 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] r52541 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPkgSearchFilterView.cc
by sh-sh-sh＠svn.opensuse.org 24 Oct '08

24 Oct '08

Author: sh-sh-sh Date: Fri Oct 24 18:26:23 2008 New Revision: 52541 URL: http://svn.opensuse.org/viewcvs/yast?rev=52541&view=rev Log: Fixed bnc # 403367: Crash when searching for invalid regex Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgSearchFilterView.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=52541&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Fri Oct 24 18:26:23 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "17") -SET(VERSION_PATCH "13") +SET(VERSION_PATCH "14") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Fri Oct 24 18:26:23 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 24 18:25:17 CEST 2008 - sh(a)suse.de + +- Fixed bnc # 403367: Crash when searching for invalid regex +- V 2.17.4 + +------------------------------------------------------------------- Tue Oct 21 15:59:49 CEST 2008 - sh(a)suse.de - Fixed bnc #436783: Map Amusements/Teaching/* to Education Modified: trunk/qt-pkg/src/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgSearchFilterView… ============================================================================== --- trunk/qt-pkg/src/YQPkgSearchFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgSearchFilterView.cc Fri Oct 24 18:26:23 2008 @@ -28,11 +28,12 @@ #include <QProgressDialog> #include <QDateTime> #include <QKeyEvent> +#include <QMessageBox> -#include "zypp/PoolQuery.h" +#include <zypp/PoolQuery.h> #define YUILogComponent "qt-pkg" -#include "YUILog.h" +#include <YUILog.h> #include "YQPackageSelector.h" #include "YQPkgSearchFilterView.h" @@ -89,27 +90,27 @@ QGroupBox * gbox = new QGroupBox( _( "Search in" ), this ); Q_CHECK_PTR( gbox ); - layout->addWidget(gbox); - QVBoxLayout *vlayout = new QVBoxLayout; - gbox->setLayout(vlayout); + layout->addWidget( gbox ); + QVBoxLayout *vLayout = new QVBoxLayout; + gbox->setLayout( vLayout ); _searchInName = new QCheckBox( _( "&Name" ), gbox ); Q_CHECK_PTR( _searchInName ); - vlayout->addWidget(_searchInName); + vLayout->addWidget(_searchInName); _searchInSummary = new QCheckBox( _( "Su&mmary" ), gbox ); Q_CHECK_PTR( _searchInSummary ); - vlayout->addWidget(_searchInSummary); + vLayout->addWidget(_searchInSummary); _searchInDescription = new QCheckBox( _( "Descr&iption" ), gbox ); Q_CHECK_PTR( _searchInDescription ); - vlayout->addWidget(_searchInDescription); + vLayout->addWidget(_searchInDescription); - vlayout->addStretch(); + vLayout->addStretch(); // Intentionally NOT marking RPM tags for translation _searchInProvides = new QCheckBox( "RPM \"&Provides\"" , gbox ); Q_CHECK_PTR( _searchInProvides ); - vlayout->addWidget(_searchInProvides); + vLayout->addWidget(_searchInProvides); _searchInRequires = new QCheckBox( "RPM \"Re&quires\"" , gbox ); Q_CHECK_PTR( _searchInRequires ); - vlayout->addWidget(_searchInRequires); + vLayout->addWidget(_searchInRequires); - _searchInFileList = new QCheckBox( "File list" , gbox ); Q_CHECK_PTR( _searchInFileList ); - vlayout->addWidget(_searchInFileList); + _searchInFileList = new QCheckBox( _( "File list" ), gbox ); Q_CHECK_PTR( _searchInFileList ); + vLayout->addWidget(_searchInFileList); _searchInName->setChecked( true ); @@ -124,22 +125,22 @@ label = new QLabel( _( "Search &Mode:" ), this ); Q_CHECK_PTR( label ); - layout->addWidget(label); + layout->addWidget( label ); _searchMode = new QComboBox( this ); Q_CHECK_PTR( _searchMode ); - layout->addWidget(_searchMode); + layout->addWidget( _searchMode ); _searchMode->setEditable( false ); label->setBuddy( _searchMode ); // Caution: combo box items must be inserted in the same order as enum SearchMode! - _searchMode->addItem( _( "Contains" ) ); - _searchMode->addItem( _( "Begins with" ) ); - _searchMode->addItem( _( "Exact Match" ) ); - _searchMode->addItem( _( "Use Wild Cards" ) ); - _searchMode->addItem( _( "Use Regular Expression" ) ); + _searchMode->addItem( _( "Contains" ) ); + _searchMode->addItem( _( "Begins with" ) ); + _searchMode->addItem( _( "Exact Match" ) ); + _searchMode->addItem( _( "Use Wild Cards" ) ); + _searchMode->addItem( _( "Use Regular Expression" ) ); _searchMode->setCurrentIndex( Contains ); @@ -151,7 +152,7 @@ layout->addWidget(_caseSensitive); for ( int i=0; i < 6; i++ ) - layout->addStretch(); + layout->addStretch(); } @@ -210,113 +211,139 @@ emit filterStart(); _matchCount = 0; - if ( ! _searchText->currentText().isEmpty() ) + try { - // Create a progress dialog that is only displayed if the search takes - // longer than a couple of seconds ( default: 4 ). + if ( ! _searchText->currentText().isEmpty() ) + { + // Create a progress dialog that is only displayed if the search takes + // longer than a couple of seconds ( default: 4 ). - zypp::PoolQuery query; - query.addKind(zypp::ResKind::package); - - string searchtext = _searchText->currentText().toUtf8().data(); - - QProgressDialog progress( _( "Searching..." ), // text - _( "&Cancel" ), // cancelButtonLabel - 0, - 1000, - this // parent - ); - progress.setWindowTitle( "" ); - progress.setMinimumDuration( 1500 ); // millisec - // HACK, this should go to YQPackageSelector - parentWidget()->parentWidget()->setCursor(Qt::WaitCursor); - progress.setCursor(Qt::ArrowCursor); - - QTime timer; - query.setCaseSensitive( _caseSensitive->isChecked() ); - - switch ( _searchMode->currentIndex() ) - { - case Contains: - query.setMatchSubstring(); - break; - case BeginsWith: - query.setMatchRegex(); - searchtext = "^" + searchtext; - break; - case ExactMatch: - break; - case UseWildcards: - query.setMatchGlob(); - break; - case UseRegExp: - query.setMatchRegex(); - break; - // Intentionally omitting "default" branch - let gcc watch for unhandled enums - } - - query.addString(searchtext); - - if ( _searchInName->isChecked() ) - query.addAttribute( zypp::sat::SolvAttr::name ); - if ( _searchInDescription->isChecked() ) - query.addAttribute( zypp::sat::SolvAttr::description ); - if ( _searchInSummary->isChecked() ) - query.addAttribute( zypp::sat::SolvAttr::summary ); - if ( _searchInRequires->isChecked() ) - query.addAttribute( zypp::sat::SolvAttr("solvable:requires") ); - if ( _searchInProvides->isChecked() ) - query.addAttribute( zypp::sat::SolvAttr("solvable:provides") ); - if ( _searchInFileList->isChecked() ) - { - query.addAttribute( zypp::sat::SolvAttr::filelist ); - query.matchFiles(); - } - - // always look in keywords so FATE #120368 is implemented - // but make this configurable later - query.addAttribute( zypp::sat::SolvAttr::keywords ); - - _searchText->setEnabled(false); - _searchButton->setEnabled(false); - - timer.start(); - - int count = 0; - - for ( zypp::PoolQuery::Selectable_iterator it = query.selectableBegin(); - it != query.selectableEnd() && ! progress.wasCanceled(); - ++it ) - { - ZyppSel selectable = *it; - ZyppPkg zyppPkg = tryCastToZyppPkg( selectable->theObj() ); + zypp::PoolQuery query; + query.addKind(zypp::ResKind::package); + + string searchtext = _searchText->currentText().toUtf8().data(); + + QProgressDialog progress( _( "Searching..." ), // text + _( "&Cancel" ), // cancelButtonLabel + 0, + 1000, + this // parent + ); + progress.setWindowTitle( "" ); + progress.setMinimumDuration( 1500 ); // millisec + + // HACK, this should go to YQPackageSelector + parentWidget()->parentWidget()->setCursor(Qt::WaitCursor); + progress.setCursor(Qt::ArrowCursor); - if ( zyppPkg ) - { - _matchCount++; - emit filterMatch( selectable, zyppPkg ); - } - - if ( progress.wasCanceled() ) - break; - - progress.setValue( count++ ); + QTime timer; + query.setCaseSensitive( _caseSensitive->isChecked() ); - if ( timer.elapsed() > 300 ) // milisec + switch ( _searchMode->currentIndex() ) { - // Process events only every 300 milliseconds - this is very - // expensive since both the progress dialog and the package - // list change all the time, thus display updates are necessary - // each time. + case Contains: + query.setMatchSubstring(); + break; + case BeginsWith: + query.setMatchRegex(); + searchtext = "^" + searchtext; + break; + case ExactMatch: + break; + case UseWildcards: + query.setMatchGlob(); + break; + case UseRegExp: + query.setMatchRegex(); + break; - qApp->processEvents(); - timer.restart(); + // Intentionally omitting "default" branch - let gcc watch for unhandled enums + } + + query.addString( searchtext ); + + if ( _searchInName->isChecked() ) query.addAttribute( zypp::sat::SolvAttr::name ); + if ( _searchInDescription->isChecked() ) query.addAttribute( zypp::sat::SolvAttr::description ); + if ( _searchInSummary->isChecked() ) query.addAttribute( zypp::sat::SolvAttr::summary ); + if ( _searchInRequires->isChecked() ) query.addAttribute( zypp::sat::SolvAttr("solvable:requires") ); + if ( _searchInProvides->isChecked() ) query.addAttribute( zypp::sat::SolvAttr("solvable:provides") ); + if ( _searchInFileList->isChecked() ) + { + query.addAttribute( zypp::sat::SolvAttr::filelist ); + query.matchFiles(); } + + // always look in keywords so FATE #120368 is implemented + // but make this configurable later + query.addAttribute( zypp::sat::SolvAttr::keywords ); + + _searchText->setEnabled(false); + _searchButton->setEnabled(false); + + timer.start(); + + int count = 0; + + for ( zypp::PoolQuery::Selectable_iterator it = query.selectableBegin(); + it != query.selectableEnd() && ! progress.wasCanceled(); + ++it ) + { + ZyppSel selectable = *it; + ZyppPkg zyppPkg = tryCastToZyppPkg( selectable->theObj() ); + + if ( zyppPkg ) + { + _matchCount++; + emit filterMatch( selectable, zyppPkg ); + } + + if ( progress.wasCanceled() ) + break; + + progress.setValue( count++ ); + + if ( timer.elapsed() > 300 ) // milisec + { + // Process events only every 300 milliseconds - this is very + // expensive since both the progress dialog and the package + // list change all the time, thus display updates are necessary + // each time. + + qApp->processEvents(); + timer.restart(); + } + } + + if ( _matchCount == 0 ) + emit message( _( "No Results." ) ); } + } + catch ( const std::exception & exception ) + { + yuiWarning() << "CAUGHT zypp exception: " << exception.what() << endl; + + QMessageBox msgBox; + + // Translators: This is a (short) text indicating that something went + // wrong while searching for packages. At this point, it is not clear + // if it's a user error (e.g., syntax error in regular expression) or + // an internal error. But there is a "Details" button that will return + // the original (translated) error message. - if ( _matchCount == 0 ) - emit message( _( "No Results." ) ); + QString heading = _( "Query Error" ); + + if ( heading.length() < 25 ) // Avoid very narrow message boxes + { + QString blanks; + blanks.fill( ' ', 50 - heading.length() ); + heading += blanks; + } + + msgBox.setText( heading ); + msgBox.setIcon( QMessageBox::Warning ); + msgBox.setInformativeText( fromUTF8( exception.what() ) ); + msgBox.exec(); } _searchText->setEnabled(true); @@ -326,6 +353,7 @@ emit filterFinished(); } + bool YQPkgSearchFilterView::check( ZyppSel selectable, ZyppObj zyppObj ) -- 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] r52540 - in /trunk/gtk: ChangeLog src/YGDialog.cc src/YGPackageSelector.cc src/yzyppwrapper.cc src/yzyppwrapper.h
by rpmcruz＠svn.opensuse.org 24 Oct '08

24 Oct '08

Author: rpmcruz Date: Fri Oct 24 17:32:29 2008 New Revision: 52540 URL: http://svn.opensuse.org/viewcvs/yast?rev=52540&view=rev Log: * src/YGDialog (setMinSize): fixed height. * src/yzyppwrapper.h/cc: added Package::support() and notifyMesage() interface in order to support ResObject::insnotify() and delnotify(). * src/YGPackageSelector: added Support expander and honor notifyMessage(). Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDialog.cc trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/yzyppwrapper.cc trunk/gtk/src/yzyppwrapper.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=52540&r1=52539… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Oct 24 17:32:29 2008 @@ -3,6 +3,14 @@ * src/YGPackageSelector (ListView): shortcut: when row activated (double-click or space) install the package. + * src/YGDialog (setMinSize): fixed height. + + * src/yzyppwrapper.h/cc: added Package::support() and notifyMesage() + interface in order to support ResObject::insnotify() and delnotify(). + + * src/YGPackageSelector: added Support expander and honor + notifyMessage(). + 2008-10-23 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/yzyppwrapper.cc: bug fix 436948: recommended & suggested in Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=52540&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Fri Oct 24 17:32:29 2008 @@ -436,7 +436,7 @@ { GtkWidget *window = m_window->getWidget(); width = MIN (YUI::app()->displayWidth(), width); - height = MIN (YUI::app()->displayHeight(), width); + height = MIN (YUI::app()->displayHeight(), height); if (window->allocation.width < width || window->allocation.height < height) { width = MAX (width, window->allocation.width), height = MAX (height, window->allocation.height); Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Fri Oct 24 17:32:29 2008 @@ -2015,7 +2015,7 @@ }; GtkWidget *m_widget, *m_icon, *m_icon_frame; -TextExpander *m_description, *m_filelist, *m_changelog, *m_authors; +TextExpander *m_description, *m_filelist, *m_changelog, *m_authors, *m_support; DepExpander *m_dependencies; Listener *m_listener; @@ -2045,17 +2045,19 @@ m_filelist = new TextExpander (_("File List")); m_changelog = new TextExpander (_("Changelog")); m_authors = new TextExpander (_("Authors")); + m_support = new TextExpander (_("Support")); m_dependencies = new DepExpander (_("Dependencies")); gtk_box_pack_start (GTK_BOX (vbox), m_filelist->getWidget(), FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), m_changelog->getWidget(), FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), m_authors->getWidget(), FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), m_dependencies->getWidget(), FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), m_support->getWidget(), FALSE, TRUE, 0); if (CAN_OPEN_URIS()) g_signal_connect (G_OBJECT (m_filelist->text), "link-clicked", G_CALLBACK (link_pressed_cb), this); } else { - m_filelist = m_changelog = m_authors = NULL; + m_filelist = m_changelog = m_authors = m_support = NULL; m_dependencies = NULL; } } @@ -2065,6 +2067,7 @@ delete m_filelist; delete m_changelog; delete m_authors; + delete m_support; delete m_dependencies; } @@ -2081,6 +2084,7 @@ if (m_filelist) m_filelist->setText (package->filelist (true)); if (m_changelog) m_changelog->setText (package->changelog()); if (m_authors) m_authors->setText (package->authors (true)); + if (m_support) m_support->setText (package->support (true)); if (m_dependencies) m_dependencies->setPackage (package); gtk_image_clear (GTK_IMAGE (m_icon)); @@ -2109,6 +2113,7 @@ if (m_filelist) m_filelist->setText (""); if (m_changelog) m_changelog->setText (""); if (m_authors) m_authors->setText (""); + if (m_support) m_support->setText (""); if (m_dependencies) m_dependencies->setPackage (NULL); } } @@ -2491,7 +2496,7 @@ YGWidget (this, parent, true, YGTK_TYPE_WIZARD, NULL) { setBorder (0); - YGDialog::currentDialog()->setMinSize (650, 800); // enlarge + YGDialog::currentDialog()->setMinSize (650, 750); // enlarge YGtkWizard *wizard = YGTK_WIZARD (getWidget()); ygtk_wizard_set_header_icon (wizard, @@ -2616,28 +2621,30 @@ } } - virtual bool acceptLicense (Ypp::Package *package, const std::string &license) + bool acceptText (Ypp::Package *package, const std::string &title, + const std::string &open, const std::string &text, bool question) { - GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - (GtkDialogFlags) 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, - "%s %s", package->name().c_str(), _("License Agreement")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - "%s", _("Do you accept the terms of this license?")); + GtkWidget *dialog = gtk_message_dialog_new_with_markup (YGDialog::currentWindow(), + (GtkDialogFlags) 0, question ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO, + question ? GTK_BUTTONS_YES_NO : GTK_BUTTONS_OK, + "%s %s", package->name().c_str(), title.c_str()); + if (!open.empty()) + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + "%s", open.c_str()); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); - GtkWidget *license_view, *license_window; - license_view = ygtk_html_wrap_new(); - ygtk_html_wrap_set_text (license_view, license.c_str(), FALSE); + GtkWidget *view = ygtk_html_wrap_new(), *scroll; + ygtk_html_wrap_set_text (view, text.c_str(), FALSE); - license_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (license_window), + scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type - (GTK_SCROLLED_WINDOW (license_window), GTK_SHADOW_IN); - gtk_container_add (GTK_CONTAINER (license_window), license_view); + (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_IN); + gtk_container_add (GTK_CONTAINER (scroll), view); GtkBox *vbox = GTK_BOX (GTK_DIALOG(dialog)->vbox); - gtk_box_pack_start (vbox, license_window, TRUE, TRUE, 6); + gtk_box_pack_start (vbox, scroll, TRUE, TRUE, 6); gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); gtk_window_set_default_size (GTK_WINDOW (dialog), 550, 450); @@ -2645,11 +2652,21 @@ gint ret = gtk_dialog_run (GTK_DIALOG (dialog)); bool confirmed = (ret == GTK_RESPONSE_YES); - gtk_widget_destroy (dialog); return confirmed; } + virtual bool acceptLicense (Ypp::Package *package, const std::string &license) + { + return acceptText (package, _("License Agreement"), + _("Do you accept the terms of this license?"), license, true); + } + + virtual void notifyMessage (Ypp::Package *package, const std::string &msg) + { + acceptText (package, _("Notification"), "", msg, false); + } + virtual bool resolveProblems (const std::list <Ypp::Problem *> &problems) { // we can't use ordinary radio buttons, as gtk+ enforces that in a group Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=5254… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Fri Oct 24 17:32:29 2008 @@ -160,6 +160,7 @@ // for Packages bool acceptLicense (Ypp::Package *package, const std::string &license); + void notifyMessage (Ypp::Package *package, const std::string &message); void packageModified (Ypp::Package *package); // for the Primitive Pools @@ -210,6 +211,7 @@ virtual std::string filelist (bool rich) { return ""; } virtual std::string changelog() { return ""; } virtual std::string authors (bool rich) { return ""; } + virtual std::string support (bool rich) { return ""; } virtual std::string icon() { return ""; } virtual bool isRecommended() const { return false; } virtual bool isSuggested() const { return false; } @@ -265,6 +267,7 @@ std::string Ypp::Package::filelist (bool rich) { return impl->filelist (rich); } std::string Ypp::Package::changelog() { return impl->changelog(); } std::string Ypp::Package::authors (bool rich) { return impl->authors (rich); } +std::string Ypp::Package::support (bool rich) { return impl->support (rich); } std::string Ypp::Package::icon() { return impl->icon(); } bool Ypp::Package::isRecommended() const { return impl->isRecommended(); } bool Ypp::Package::isSuggested() const { return impl->isSuggested(); } @@ -424,28 +427,17 @@ text += br; } - if (!isInstalled()) { + if (!isInstalled() && (isRecommended() || isSuggested())) { + text += ""; if (isRecommended()) - text += br + _("(As this package is an extension to an already installed package, it is recommended it be installed.)") + br; + text += _("(As this package is an extension to an already installed package, it is recommended it be installed.)"); if (isSuggested()) - text += br + _("(As this package complements some installed packages, it is suggested it be installed.)") + br; + text += _("(As this package complements some installed packages, it is suggested it be installed.)"); + text += "" + br; } // specific ZyppPackage package = tryCastToZyppPkg (object); -#if ZYPP_VERSION >= 5013001 - bool unsupported = isUnsupported(); - if (unsupported) - text += ""; - text += br + "" + _("Support:") + " " + - zypp::asUserStringDescription (package->vendorSupport().c_str(); -// zypp::asUserStringName (package->vendorSupport().c_str(); -/* text += ""; - text += _("This package is not covered by the default support contract."); - text += "";*/ - if (unsupported) - text += ""; -#endif std::string url = package->url(), license = package->license(); if (!url.empty()) text += br + "" + _("Website:") + " <a href=\"" + url + "\">" + url + "</a>"; @@ -591,8 +583,9 @@ ZyppObject object = m_sel->theObj(); ZyppPackage package = tryCastToZyppPkg (object); if (package) { - std::string packager = package->packager(), authors; + std::string packager = package->packager(), vendor = package->vendor(), authors; YGUtils::escapeMarkup (packager); + YGUtils::escapeMarkup (vendor); const std::list <std::string> &authorsList = package->authors(); for (std::list <std::string>::const_iterator it = authorsList.begin(); it != authorsList.end(); it++) { @@ -636,6 +629,8 @@ } if (rich) { + if (!vendor.empty()) + text += _("Vendor:") + ("<blockquote>" + vendor) + "</blockquote>"; if (!authors.empty()) text += _("Developed by:") + ("<blockquote>" + authors) + "</blockquote>"; if (!packager.empty()) @@ -647,6 +642,24 @@ return text; } + virtual std::string support (bool rich) + { + std::string text; +#if ZYPP_VERSION >= 5013001 + ZyppObject object = m_sel->theObj(); + ZyppPackage package = tryCastToZyppPkg (object); + if (package) { + zypp::VendorSupportOption opt = package->vendorSupport(); + text = zypp::asUserString (opt) + ": "; + std::string str (zypp::asUserStringDescription (opt)); + if (rich) + YGUtils::escapeMarkup (str); + text += str; + } +#endif + return text; + } + virtual std::string icon() { if (type == Ypp::Package::PATTERN_TYPE) { @@ -814,11 +827,16 @@ return; if (!m_sel->hasLicenceConfirmed()) { - const std::string &license = m_sel->candidateObj()->licenseToConfirm(); + ZyppObject obj = m_sel->candidateObj(); + const std::string &license = obj->licenseToConfirm(); if (!license.empty()) if (!ypp->impl->acceptLicense (m_parent, license)) return; m_sel->setLicenceConfirmed(); + + const std::string &msg = obj->insnotify(); + if (!msg.empty()) + ypp->impl->notifyMessage (m_parent, msg); } zypp::ui::Status status = m_sel->status(); @@ -865,6 +883,12 @@ virtual void remove() { + if (m_sel->hasCandidateObj()) { + const std::string &msg = m_sel->candidateObj()->delnotify(); + if (!msg.empty()) + ypp->impl->notifyMessage (m_parent, msg); + } + zypp::ui::Status status = m_sel->status(); switch (status) { // not applicable @@ -2014,7 +2038,13 @@ { if (interface) return interface->acceptLicense (package, license); - return false; + return true; +} + +void Ypp::Impl::notifyMessage (Ypp::Package *package, const std::string &message) +{ + if (interface) + interface->notifyMessage (package, message); } Ypp::Problem::Solution *Ypp::Problem::getSolution (int nb) Modified: trunk/gtk/src/yzyppwrapper.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.h?rev=52540… ============================================================================== --- trunk/gtk/src/yzyppwrapper.h (original) +++ trunk/gtk/src/yzyppwrapper.h Fri Oct 24 17:32:29 2008 @@ -57,6 +57,7 @@ std::string filelist (bool rich); std::string changelog(); std::string authors (bool rich); + std::string support (bool rich); std::string icon(); bool isRecommended() const; bool isSuggested() const; @@ -218,6 +219,7 @@ struct Interface { virtual bool acceptLicense (Package *package, const std::string &license) = 0; + virtual void notifyMessage (Package *package, const std::string &message) = 0; // resolveProblems = false to cancel the action that had that effect virtual bool resolveProblems (const std::list <Problem *> &problems) = 0; virtual bool allowRestrictedRepo (const std::list <std::pair <const Package *, const Repository *> > &pkgs) = 0; -- 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] r52539 - /tags/stable-2_17_12/ldap-server/
by rhafer＠svn.opensuse.org 24 Oct '08

24 Oct '08

Author: rhafer Date: Fri Oct 24 17:20:50 2008 New Revision: 52539 URL: http://svn.opensuse.org/viewcvs/yast?rev=52539&view=rev Log: Created tag stable-2_17_12 for ldap-server Added: tags/stable-2_17_12/ldap-server/ - copied from r52538, trunk/ldap-server/ -- 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] r52538 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 24 Oct '08

24 Oct '08

Author: aschnell Date: Fri Oct 24 17:04:36 2008 New Revision: 52538 URL: http://svn.opensuse.org/viewcvs/yast?rev=52538&view=rev Log: - also insserv multipathd if required Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Fri Oct 24 17:04:36 2008 @@ -5700,7 +5700,7 @@ void CallInsserv( boolean on, string name ) { y2milestone( "CallInsserv on:%1 name:%2", on, name ); - string scrname = "/etc/init.d/boot." + name; + string scrname = "/etc/init.d/" + name; if( SCR::Read( .target.size, scrname )>0 ) { string cmd = "cd / && /sbin/insserv "; @@ -5801,11 +5801,12 @@ need_crypt, need_md, need_lvm, need_dmraid, need_dmmultipath ); if( need_crypt ) - CallInsserv( true, "crypto" ); - CallInsserv( need_md, "md" ); - CallInsserv( need_lvm, "lvm" ); - CallInsserv( need_dmraid, "dmraid" ); - CallInsserv( need_dmmultipath, "multipath" ); + CallInsserv( true, "boot.crypto" ); + CallInsserv( need_md, "boot.md" ); + CallInsserv( need_lvm, "boot.lvm" ); + CallInsserv( need_dmraid, "boot.dmraid" ); + CallInsserv( need_dmmultipath, "boot.multipath" ); + CallInsserv( need_dmmultipath, "multipathd" ); y2milestone("FinishInstall done"); } -- 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] r52537 - /tags/stable-2_17_6/theme/
by jsrain＠svn.opensuse.org 24 Oct '08

24 Oct '08

Author: jsrain Date: Fri Oct 24 17:04:29 2008 New Revision: 52537 URL: http://svn.opensuse.org/viewcvs/yast?rev=52537&view=rev Log: Created tag stable-2_17_6 for theme Added: tags/stable-2_17_6/theme/ - copied from r52536, trunk/theme/ -- 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] r52536 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 24 Oct '08

24 Oct '08

Author: aschnell Date: Fri Oct 24 16:53:17 2008 New Revision: 52536 URL: http://svn.opensuse.org/viewcvs/yast?rev=52536&view=rev Log: - fixed insserv multipath Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Fri Oct 24 16:53:17 2008 @@ -5805,7 +5805,7 @@ CallInsserv( need_md, "md" ); CallInsserv( need_lvm, "lvm" ); CallInsserv( need_dmraid, "dmraid" ); - CallInsserv( need_dmraid, "multipathd" ); + CallInsserv( need_dmmultipath, "multipath" ); y2milestone("FinishInstall done"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0