Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2014-03-11 09:24:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2014-03-01 14:38:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2014-03-11 09:24:05.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Mar 6 13:47:12 CET 2014 - [email protected] + +- Changed DefaultDesktop not to select any required packages + anymore. They have changed to packages to identify selected + desktop only (bnc#866724). +- 3.1.7 + +------------------------------------------------------------------- Old: ---- yast2-packager-3.1.6.tar.bz2 New: ---- yast2-packager-3.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.IQuhrC/_old 2014-03-11 09:24:06.000000000 +0100 +++ /var/tmp/diff_new_pack.IQuhrC/_new 2014-03-11 09:24:06.000000000 +0100 @@ -17,12 +17,13 @@ Name: yast2-packager -Version: 3.1.6 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 +Url: https://github.com/kobliha/yast-packager BuildRequires: update-desktop-files BuildRequires: yast2-country-data BuildRequires: yast2-devtools >= 3.1.10 ++++++ yast2-packager-3.1.6.tar.bz2 -> yast2-packager-3.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.6/package/yast2-packager.changes new/yast2-packager-3.1.7/package/yast2-packager.changes --- old/yast2-packager-3.1.6/package/yast2-packager.changes 2014-02-28 14:44:49.000000000 +0100 +++ new/yast2-packager-3.1.7/package/yast2-packager.changes 2014-03-06 14:30:10.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Mar 6 13:47:12 CET 2014 - [email protected] + +- Changed DefaultDesktop not to select any required packages + anymore. They have changed to packages to identify selected + desktop only (bnc#866724). +- 3.1.7 + +------------------------------------------------------------------- Fri Feb 28 13:24:48 UTC 2014 - [email protected] - Fix iso detection for DVD capable UEFI boot(BNC#852436) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.6/package/yast2-packager.spec new/yast2-packager-3.1.7/package/yast2-packager.spec --- old/yast2-packager-3.1.6/package/yast2-packager.spec 2014-02-28 14:44:49.000000000 +0100 +++ new/yast2-packager-3.1.7/package/yast2-packager.spec 2014-03-06 14:30:10.000000000 +0100 @@ -17,12 +17,13 @@ Name: yast2-packager -Version: 3.1.6 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 +Url: https://github.com/kobliha/yast-packager Group: System/YaST License: GPL-2.0+ BuildRequires: yast2-country-data yast2-xml update-desktop-files yast2-testsuite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.6/src/modules/DefaultDesktop.rb new/yast2-packager-3.1.7/src/modules/DefaultDesktop.rb --- old/yast2-packager-3.1.6/src/modules/DefaultDesktop.rb 2014-02-28 14:44:50.000000000 +0100 +++ new/yast2-packager-3.1.7/src/modules/DefaultDesktop.rb 2014-03-06 14:30:10.000000000 +0100 @@ -1,11 +1,10 @@ # encoding: utf-8 -# File: DefaultDesktop.ycp +# File: DefaultDesktop.rb # Package: Handling of default desktop selection # Authors: Jiri Srain <[email protected]> # Lukas Ocilka <[email protected]> -# -# $Id$ + require "yast" module Yast @@ -32,7 +31,6 @@ @initialized = false @packages_proposal_ID_patterns = "DefaultDesktopPatterns" - @packages_proposal_ID_packages = "DefaultDesktopPackages" end def MissingKey(desktop_def, key) @@ -221,7 +219,7 @@ # "description" : _("Description text of the desktop (localized - initial localization)"), # "description_id" : _("Description text of the desktop (originale)"), # "patterns" : ["list", "of", "required", "patterns"], - # "packages" : ["list", "of", "required", "packages"], + # "packages" : ["list", "of", "packages", "to", "identify", "selected", "desktop"], # "icon" : "some-icon", // filename from the 64x64 directory of the current theme (without .png suffix) # ], # ] @@ -295,11 +293,6 @@ :pattern, [] ) - PackagesProposal.SetResolvables( - @packages_proposal_ID_packages, - :package, - [] - ) elsif !Builtins.haskey(@all_desktops, new_desktop) Builtins.y2error("Attempting to set desktop to unknown %1", new_desktop) else @@ -314,11 +307,6 @@ :pattern, Ops.get_list(@all_desktops, [@desktop, "patterns"], []) ) - PackagesProposal.SetResolvables( - @packages_proposal_ID_packages, - :package, - Ops.get_list(@all_desktops, [@desktop, "packages"], []) - ) end end @@ -329,8 +317,10 @@ PackagesProposal.GetResolvables(@packages_proposal_ID_patterns, :pattern) end + # Deprecated: Packages are not selected by a desktop selection only patterns + # bnc#866724 def SelectedPackages - PackagesProposal.GetResolvables(@packages_proposal_ID_packages, :package) + [] end # Get preffered window/desktop manager for the selected desktop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.6/testsuite/tests/DefaultDesktop.out new/yast2-packager-3.1.7/testsuite/tests/DefaultDesktop.out --- old/yast2-packager-3.1.6/testsuite/tests/DefaultDesktop.out 2014-02-28 14:44:50.000000000 +0100 +++ new/yast2-packager-3.1.7/testsuite/tests/DefaultDesktop.out 2014-03-06 14:30:10.000000000 +0100 @@ -3,14 +3,14 @@ Dump --- KDE selected by default --- Return kde Return ["kde", "x11", "base"] -Return ["kdm", "branding-openSUSE"] +Return [] Dump --- Selecting GNOME --- Return nil Return gnome Return ["gnome", "x11", "base"] -Return ["gdm", "branding-openSUSE"] +Return [] Dump --- Reset --- Return nil Return kde Return ["kde", "x11", "base"] -Return ["kdm", "branding-openSUSE"] +Return [] -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
