November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41896 - in /trunk/profile-manager: VERSION package/yast2-profile-manager.changes src/ProfileManager.ycp src/dialogs.ycp
by jsuchome＠svn.opensuse.org 08 Nov '07

08 Nov '07

Author: jsuchome Date: Thu Nov 8 22:14:47 2007 New Revision: 41896 URL: http://svn.opensuse.org/viewcvs/yast?rev=41896&view=rev Log: - read from correct config file (#337913) - do not write translated "file"/"service" into DB (#337913) - fixed checking for duplicate resources (#340182) - added "Active" header to table with resources (#340182) - 2.16.0 Modified: trunk/profile-manager/VERSION trunk/profile-manager/package/yast2-profile-manager.changes trunk/profile-manager/src/ProfileManager.ycp trunk/profile-manager/src/dialogs.ycp Modified: trunk/profile-manager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/VERSION?rev=4189… ============================================================================== --- trunk/profile-manager/VERSION (original) +++ trunk/profile-manager/VERSION Thu Nov 8 22:14:47 2007 @@ -1 +1 @@ -2.15.0 +2.16.0 Modified: trunk/profile-manager/package/yast2-profile-manager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/package/yast2-pr… ============================================================================== --- trunk/profile-manager/package/yast2-profile-manager.changes (original) +++ trunk/profile-manager/package/yast2-profile-manager.changes Thu Nov 8 22:14:47 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Nov 6 11:16:48 CET 2007 - jsuchome(a)suse.cz + +- read from correct config file (#337913) +- do not write translated "file"/"service" into DB (#337913) +- fixed checking for duplicate resources (#340182) +- added "Active" header to table with resources (#340182) +- 2.16.0 + +------------------------------------------------------------------- Tue Jun 12 13:21:29 CEST 2007 - jsuchome(a)suse.cz - check if resource group is installed before selecting it (#143273) Modified: trunk/profile-manager/src/ProfileManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/ProfileManag… ============================================================================== --- trunk/profile-manager/src/ProfileManager.ycp (original) +++ trunk/profile-manager/src/ProfileManager.ycp Thu Nov 8 22:14:47 2007 @@ -511,7 +511,7 @@ */ global define boolean ReadConfigFile () ``{ - if (! FileUtils::Exists ("/etc/scpm.conf")) + if (! FileUtils::Exists ("/etc/sysconfig/scpm")) return false; scpm_conf = $[ Modified: trunk/profile-manager/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/dialogs.ycp?… ============================================================================== --- trunk/profile-manager/src/dialogs.ycp (original) +++ trunk/profile-manager/src/dialogs.ycp Thu Nov 8 22:14:47 2007 @@ -163,20 +163,26 @@ // map for saving user_defined flags of each resource map user_defined = $[]; + // resource type (menu entry) + string filestring = _("File"); + // resource type (menu entry) + string servicestring= _("Service"); map type2string = $[ - // resource type (menu entry) - "file" : _("File"), - // resource type (menu entry) - "service" : _("Service"), + "file" : filestring, + "service" : servicestring + ]; + map string2type = $[ + filestring : "file", + servicestring : "service", ]; /** * Scan table items for presence of given resource */ - define boolean has_resource (string name, string type) ``{ - - return (contains (items, `item(`id(name), "X", name, type)) || - contains (items, `item(`id(name), "", name, type))); + define boolean has_resource (string name, string type) { + string translated = type2string [type]:type; + return (contains (items, `item(`id(name), "X", name, translated)) || + contains (items, `item(`id(name), "", name, translated))); } /** * helper function for building table items of one resource group @@ -207,7 +213,8 @@ `VSpacing(0.2), `Table(`id(`resources), `opt (`notify), `header( - " ", + // Header of the table with resources of one group 1/3 + _("Active"), // Header of the table with resources of one group 2/3 _("Name"), // Header of the table with resources of one group 3/3 @@ -301,23 +308,45 @@ if (ret == `adds_b) { string service = GetService (); - if (service != "" && !has_resource (service,"service")) + if (service != "") { - y2debug ("new service %1 for group %2", service, groupname); - items = add (items, `item(`id(service), "", service,"service")); - user_defined [service] = true; - UI::ChangeWidget(`id(`resources), `Items, items); + if (has_resource (service,"service")) + { + // message popup + Popup::Message (sformat (_("Service +%1 +is already present in this resource group."), service)); + } + else + { + y2debug ("new service %1 for group %2", service, groupname); + items = add (items, `item(`id(service), "", service, + type2string["service"]:"service")); + user_defined [service] = true; + UI::ChangeWidget(`id(`resources), `Items, items); + } } } if (ret == `addf_b) { string file = GetFile (); - if (file != "" && !has_resource (file,"file")) + if (file != "") { - y2debug ("new file %1 for group %2", file, groupname); - items = add (items, `item(`id(file), "", file, "file")); - user_defined [file] = true; - UI::ChangeWidget(`id(`resources), `Items, items); + if (has_resource (file, "file")) + { + // message popup + Popup::Message (sformat (_("File +%1 +is already present in this resource group."), file)); + } + else + { + y2debug ("new file %1 for group %2", file, groupname); + items = add (items, `item(`id(file), "", file, + type2string["file"]:"file")); + user_defined [file] = true; + UI::ChangeWidget(`id(`resources), `Items, items); + } } } if (ret == `ok) @@ -358,7 +387,7 @@ return $[ "active" : i[1]:"" == "X", "name" : i[2]:"", - "type" : i[3]:"", + "type" : string2type[i[3]:""]:(i[3]:""), "user_defined" : user_defined [ i[2]:""]:false ]; }); @@ -469,7 +498,8 @@ `VSpacing(0.2), `Table(`id(`rgroups), `opt (`notify), `header( - " ", + // Header of the table with resource groups 1/3 + _("Active"), // Header of the table with resource groups 2/3 _("Name"), // Header of the table with resource groups 3/3 @@ -563,7 +593,8 @@ list<string> missing_files = []; foreach (map res, group["resources"]:[], { string name = res["name"]:""; - if (res["type"]:"" == "file" && !FileUtils::Exists (name)) + if (res["type"]:"" == "file" && res["active"]:false && + !FileUtils::Exists (name)) missing_files = add (missing_files, res["name"]:""); }); if (missing_files != [] && !Popup::AnyQuestionRichText (Popup::NoHeadline (), -- 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] r41895 - in /trunk/gtk/mockups/package-selector: packagekit-groups.png packagekit-search.png
by rpmcruz＠svn.opensuse.org 08 Nov '07

08 Nov '07

Author: rpmcruz Date: Thu Nov 8 20:39:42 2007 New Revision: 41895 URL: http://svn.opensuse.org/viewcvs/yast?rev=41895&view=rev Log: Two shots of PackageKit, a program that aims to be a common interface for the different packing backends. Added: trunk/gtk/mockups/package-selector/packagekit-groups.png (with props) trunk/gtk/mockups/package-selector/packagekit-search.png (with props) Added: trunk/gtk/mockups/package-selector/packagekit-groups.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/mockups/package-selector/pac… ============================================================================== Binary file - no diff available. Added: trunk/gtk/mockups/package-selector/packagekit-search.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/mockups/package-selector/pac… ============================================================================== Binary file - no diff available. -- 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] r41894 - in /branches/tmp/jdsn/edu-users/src: dialogs.ycp wizards.ycp
by jdsn＠svn.opensuse.org 08 Nov '07

08 Nov '07

Author: jdsn Date: Thu Nov 8 19:16:26 2007 New Revision: 41894 URL: http://svn.opensuse.org/viewcvs/yast?rev=41894&view=rev Log: tabs work, basic dialogs Modified: branches/tmp/jdsn/edu-users/src/dialogs.ycp branches/tmp/jdsn/edu-users/src/wizards.ycp Modified: branches/tmp/jdsn/edu-users/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/edu-users/src/dialog… ============================================================================== --- branches/tmp/jdsn/edu-users/src/dialogs.ycp (original) +++ branches/tmp/jdsn/edu-users/src/dialogs.ycp Thu Nov 8 19:16:26 2007 @@ -34,6 +34,7 @@ import "Label"; import "Wizard"; import "EduUsers"; +import "Autologin"; include "edu-users/helps.ycp"; @@ -41,52 +42,65 @@ * Configure1 dialog * @return dialog result */ -any Configure1Dialog () { +any NewUserDialog() { //Configure1Dialog () { /* EduUsers configure1 dialog caption */ - string caption = _("EduUsers Configuration"); + string caption = _("Add New Edu User"); - /* EduUsers configure1 dialog contents */ - term contents = `Label (_("First part of configuration of edu-users")); + term fields = `VBox( + `VSquash( + `HBox( + // input field for login name + `Bottom(`TextEntry(`id(`username), _("&Username"), "bla")), + ("add_user" != "add_user") + ? `HSpacing (0) + // push button to generate login from first and last name + : `Bottom(`PushButton(`id(`propose), _("&Suggestion")))) + ), + `Password(`id(`pw1), Label::Password(), ""), + `Password(`id(`pw2), Label::ConfirmPassword(), "") + ); + + + term optionbox = `VBox( // checkbox label + `Left( `CheckBox (`id (`autologin),_("A&utomatic Login"), Autologin::used) ) + ); + + if (true) + { // checkbox label + optionbox = add(optionbox, `Left(`CheckBox (`id(`ena), _("D&isable User Login"), !true)) ); + } - Wizard::SetContentsButtons(caption, contents, HELPS["c1"]:"", - Label::BackButton(), Label::NextButton()); + optionbox = `HBox( + `HStretch(), + `HVCenter( `HVSquash( optionbox ) ), + `HStretch() + ); - any ret = nil; - while(true) { - ret = UI::UserInput(); - /* abort? */ - if(ret == `abort || ret == `cancel) { - if(ReallyAbort()) break; - else continue; - } - else if(ret == `next || ret == `back) { - break; - } - else { - y2error("unexpected retcode: %1", ret); - continue; - } - } - - return ret; -} - -/** - * Configure2 dialog - * @return dialog result - */ -any Configure2Dialog () { + /* EduUsers configure1 dialog contents */ + term contents = `VBox(`Label (_("First part of configuration of edu-users")), `PushButton(`id(`groups), "bla")); - /* EduUsers configure2 dialog caption */ - string caption = _("EduUsers Configuration"); + contents = `VBox ( + `VSpacing(), + `VBox ( + `VSpacing( 0.5 ), + `HBox ( + `HSpacing (2), + `VBox ( + `HSquash ( fields ), + `VSpacing( 0.5 ), + `VSquash ( `Top( optionbox ) ) + ), + `HSpacing( 2 ) + ), + `VSpacing (0.5) + ) + ); - /* EduUsers configure2 dialog contents */ - term contents = `Label (_("Second part of configuration of edu-users")); - Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"", + Wizard::SetContentsButtons(caption, contents, HELPS["c1"]:"", Label::BackButton(), Label::NextButton()); any ret = nil; @@ -111,9 +125,6 @@ return ret; } -any NewUserDialog() { - return `newuserdialog; -} any UsersDialog() { @@ -130,9 +141,18 @@ if(ReallyAbort()) break; else continue; } - else if(ret == `next || ret == `back || ret == `groups || ret == `templates) { + else if (ret == `next || ret == `back || ret == `groups || ret == `templates) { + break; + } + else if (ret == `users) { + continue; + } + else if (ret == `add || ret == `edit ) { break; } + else if (ret == `delete){ + continue; + } else { y2error("unexpected retcode: %1", ret); continue; @@ -163,6 +183,12 @@ else if(ret == `next || ret == `back || ret == `users || ret == `templates) { break; } + else if(ret == `groups) { + continue; + } + else if(ret == `add || ret == `edit || ret == `delete) { + continue; + } else { y2error("unexpected retcode: %1", ret); continue; @@ -174,7 +200,7 @@ any TemplatesDialog() { // fill table with data - Popup::Notify(_("Groups")); + Popup::Notify(_("Templates")); any ret = nil; while(true) { @@ -189,6 +215,12 @@ else if(ret == `next || ret == `back || ret == `users || ret == `groups) { break; } + else if(ret == `templates) { + continue; + } + else if(ret == `add || ret == `edit || ret == `delete) { + continue; + } else { y2error("unexpected retcode: %1", ret); continue; Modified: branches/tmp/jdsn/edu-users/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/edu-users/src/wizard… ============================================================================== --- branches/tmp/jdsn/edu-users/src/wizards.ycp (original) +++ branches/tmp/jdsn/edu-users/src/wizards.ycp Thu Nov 8 19:16:26 2007 @@ -44,15 +44,20 @@ any UserAddSequence() { map aliases = $[ - "newuserdialog" : ``(NewUserDialog()) + "newuserdialog" : ``(NewUserDialog()), + "settab" : [ ``( SetTabDialog() ), true], ]; map sequence = $[ - "ws_start" : "config1", + "ws_start" : "newuserdialog", "newuserdialog" : $[ `abort : `abort, - `next : `next + `next : "settab" ], + "settab" : $[ + `abort : `abort, + `next : `next + ] ]; return Sequencer::Run(aliases, sequence); -- 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] r41893 - in /trunk/packager: package/yast2-packager.changes src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 08 Nov '07

08 Nov '07

Author: locilka Date: Thu Nov 8 16:55:28 2007 New Revision: 41893 URL: http://svn.opensuse.org/viewcvs/yast?rev=41893&view=rev Log: - Extended AskLicenseAgreement function not to skip already accepted license if such behavior requested (because of 'going back' in the installation workflow). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/ProductLicense.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Nov 8 16:55:28 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 8 16:53:48 CET 2007 - locilka(a)suse.cz + +- Extended AskLicenseAgreement function not to skip already + accepted license if such behavior requested (because of 'going + back' in the installation workflow). + +------------------------------------------------------------------- Wed Nov 7 12:48:52 CET 2007 - locilka(a)suse.cz - AutoinstSoftware::post_packages moved to Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLice… ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Thu Nov 8 16:55:28 2007 @@ -544,10 +544,13 @@ * @param boolean enable_back sets the back_button status * @param boolean base_product defines whether it is a base or add-on product * true means base product, false add-on product + * @param require_agreement means that even if the license (or the very same license) + * has been already accepetd, ask user to accept it again (because of 'going back' + * in the installation proposal). */ global symbol AskLicenseAgreement (integer src_id, string dir, list<string> patterns, string action, boolean enable_back, - boolean base_product) + boolean base_product, boolean require_agreement) { string lic_lang = ""; map <string, string> licenses = $[]; @@ -619,8 +622,9 @@ string base_license = WhichLicenceFile (license_ident_lang, licenses); string license_ident = GetLicenseIdentString (base_license); + // agreement might be required even if license has been already accepted // defined, properly ($md5sum(32)-(1)$size(1..n)) - if (license_ident != nil && size (license_ident) > 33 && IsLicenseAlreadyAccepted (license_ident)) { + if (require_agreement != true && license_ident != nil && size (license_ident) > 33 && IsLicenseAlreadyAccepted (license_ident)) { y2milestone ("License has been already accepted"); CleanUpLicense (tmpdir); @@ -802,7 +806,7 @@ [ "license\\.txt", "license\\.%1\\.txt" ], "abort", // back button is disabled - false, false); + false, false, false); } global symbol AskFirstStageLicenseAgreement (string action) { @@ -817,13 +821,13 @@ [ "license\\.txt", "license\\.%1\\.txt" ], action, // back button is enabled - enable_back, true); + enable_back, true, true); } global symbol AskInstalledLicenseAgreement (string directory, list<string> patterns, string action) { - return AskLicenseAgreement (nil, directory, patterns, action, false, true); + return AskLicenseAgreement (nil, directory, patterns, action, false, true, false); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41892 - /trunk/packager/src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 08 Nov '07

08 Nov '07

Author: locilka Date: Thu Nov 8 16:36:13 2007 New Revision: 41892 URL: http://svn.opensuse.org/viewcvs/yast?rev=41892&view=rev Log: typo Modified: trunk/packager/src/modules/ProductLicense.ycp Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLice… ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Thu Nov 8 16:36:13 2007 @@ -604,7 +604,7 @@ // Bugzilla #305503 string license_ident_lang = nil; - // We need to store the oroginal -- not localized license ID (if possible) + // We need to store the original -- not localized license ID (if possible) foreach (string check_this, ["", "en", lic_lang], { if (contains (available_langs, check_this)) { license_ident_lang = check_this; -- 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] r41891 - /tags/stable-0_7_3/metapackage/
by mvidner＠svn.opensuse.org 08 Nov '07

08 Nov '07

Author: mvidner Date: Thu Nov 8 16:20:08 2007 New Revision: 41891 URL: http://svn.opensuse.org/viewcvs/yast?rev=41891&view=rev Log: Created tag stable-0_7_3 for metapackage Added: tags/stable-0_7_3/metapackage/ - copied from r41890, trunk/metapackage/ -- 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] r41890 - /tags/stable-0_7_3/
by mvidner＠svn.opensuse.org 08 Nov '07

08 Nov '07

Author: mvidner Date: Thu Nov 8 16:20:05 2007 New Revision: 41890 URL: http://svn.opensuse.org/viewcvs/yast?rev=41890&view=rev Log: Created tag stable-0_7_3 Added: tags/stable-0_7_3/ -- 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] r41889 - in /trunk/metapackage: VERSION package/yast2-metapackage-handler.changes yast2-metapackage-handler.spec.in
by mvidner＠svn.opensuse.org 08 Nov '07

08 Nov '07

Author: mvidner Date: Thu Nov 8 15:19:26 2007 New Revision: 41889 URL: http://svn.opensuse.org/viewcvs/yast?rev=41889&view=rev Log: - Fixed missing association by calling update-mime-database (#330352). - 0.7.3 Modified: trunk/metapackage/VERSION trunk/metapackage/package/yast2-metapackage-handler.changes trunk/metapackage/yast2-metapackage-handler.spec.in Modified: trunk/metapackage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/VERSION?rev=41889&r1… ============================================================================== --- trunk/metapackage/VERSION (original) +++ trunk/metapackage/VERSION Thu Nov 8 15:19:26 2007 @@ -1 +1 @@ -0.7.2 +0.7.3 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 Thu Nov 8 15:19:26 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 8 15:15:51 CET 2007 - mvidner(a)suse.cz + +- Fixed missing association by calling update-mime-database (#330352). +- 0.7.3 + +------------------------------------------------------------------- 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) Modified: trunk/metapackage/yast2-metapackage-handler.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/yast2-metapackage-ha… ============================================================================== --- trunk/metapackage/yast2-metapackage-handler.spec.in (original) +++ trunk/metapackage/yast2-metapackage-handler.spec.in Thu Nov 8 15:19:26 2007 @@ -55,6 +55,18 @@ @CLEAN@ +%post +# #330352, SuSEconfig.desktop-file-utils only calls +# update-desktop-database +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi + +%postun +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi + %files %defattr(-,root,root) %doc @docdir@ -- 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] r41888 - /tags/stable-2_16_2/pkg-bindings/
by lslezak＠svn.opensuse.org 08 Nov '07

08 Nov '07

Author: lslezak Date: Thu Nov 8 14:51:57 2007 New Revision: 41888 URL: http://svn.opensuse.org/viewcvs/yast?rev=41888&view=rev Log: Created tag stable-2_16_2 for pkg-bindings Added: tags/stable-2_16_2/pkg-bindings/ - copied from r41887, trunk/pkg-bindings/ -- 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] r41887 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Package.cc
by lslezak＠svn.opensuse.org 08 Nov '07

08 Nov '07

Author: lslezak Date: Thu Nov 8 14:51:52 2007 New Revision: 41887 URL: http://svn.opensuse.org/viewcvs/yast?rev=41887&view=rev Log: - fixed PkgDelete() - mark all installed instances for removal - 2.16.2 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Package.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=41887&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Thu Nov 8 14:51:52 2007 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Thu Nov 8 14:51:52 2007 @@ -3,6 +3,8 @@ - fixed PkgTaboo() and PkgNeutral() - set all available instaces of the package (from all reposiories) (#297083) +- fixed PkgDelete() - mark all installed instances for removal +- 2.16.2 ------------------------------------------------------------------- Thu Oct 11 15:59:43 CEST 2007 - lslezak(a)suse.cz Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Thu Nov 8 14:51:52 2007 @@ -1801,12 +1801,11 @@ /** @builtin PkgDelete - @short Select package for deletion + @short Select package for deletion (deletes all installed instances of the package) @param string package @return boolean */ -#warning This is bogus, as we have multiple matching (kernel) packages YCPValue PkgModuleFunctions::PkgDelete (const YCPString& p) @@ -1815,31 +1814,36 @@ if (name.empty()) return YCPBoolean (false); + bool ret = true; + try { - // find the package - zypp::ResPool::byName_iterator it = std::find_if ( - zypp_ptr()->pool().byNameBegin(name) - , zypp_ptr()->pool().byNameEnd(name) - , zypp::functor::chain ( - zypp::resfilter::ByInstalled (), - zypp::resfilter::ByKind( zypp::ResTraits<zypp::Package>::kind ) - ) - ); + bool found = false; + for (zypp::ResPool::byName_iterator it = zypp_ptr()->pool().byNameBegin(name); + it != zypp_ptr()->pool().byNameEnd(name); ++it) + { + // is it an installed package? + if (zypp::isKind<zypp::Package>(it->resolvable()) && it->status().isInstalled()) + { + found = true; + ret = it->status().setToBeUninstalled(whoWantsIt) && ret; + } + } - // set the status to uninstalled - return YCPBoolean( (it != zypp_ptr()->pool().byNameEnd(name)) - && it->status().setToBeUninstalled(whoWantsIt) ); + if (!found) + { + ret = false; + } } catch (...) { + ret = false; } - return YCPBoolean (false); + return YCPBoolean(ret); } - /** @builtin PkgTaboo -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0