[yast-commit] [ci_new_pac] JFYI yast2-packager -> sle12

7 Mar 2014

Script 'mail_helper' called by ro
Hello packager,

This is just FYI.  Your package was checked in in distribution "sle12"
by autobuild-member: ro.

Here comes the log...

---------------------------%<------------------------------
Hi,

here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-packager -> sle12



## BNC# 866724 : "Cannot deselect GNOME" (CLOSED/FIXED)

Changes:
--------

--- /work/SRC/SUSE:SLE-12:GA/yast2-packager/yast2-packager.changes	2014-02-28 16:04:29.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-packager/yast2-packager.changes	2014-03-06 14:29:24.000000000 +0100
@@ -1,0 +2,8 @@
+Thu Mar  6 13:47:12 CET 2014 - locilka@suse.com
+
+- Changed DefaultDesktop not to select any required packages
+  anymore. They have changed to packages to identify selected
+  desktop only (bnc#866724).
+- 3.1.7
+
+-------------------------------------------------------------------

calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-packager
- at least 24 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-packager (Old)
 and      /mounts/work_src_done/SLE12/yast2-packager (BS:build ID:33997 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-packager", Maintainer is "yast-commit@opensuse.org"


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.IIii3G/_old	2014-03-07 17:13:51.000000000 +0100
+++ /var/tmp/diff_new_pack.IIii3G/_new	2014-03-07 17:13:51.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

++++++ 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 15:03:29.000000000 +0100
+++ new/yast2-packager-3.1.7/package/yast2-packager.changes	2014-03-06 14:26:15.000000000 +0100
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Thu Mar  6 13:47:12 CET 2014 - locilka@suse.com
+
+- 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 - jreidinger@suse.com
 
 - 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 15:03:29.000000000 +0100
+++ new/yast2-packager-3.1.7/package/yast2-packager.spec	2014-03-06 14:26:15.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 15:03:29.000000000 +0100
+++ new/yast2-packager-3.1.7/src/modules/DefaultDesktop.rb	2014-03-06 14:26:15.000000000 +0100
@@ -1,11 +1,10 @@
 # encoding: utf-8
 
-# File:	DefaultDesktop.ycp
+# File:	DefaultDesktop.rb
 # Package:	Handling of default desktop selection
 # Authors:	Jiri Srain <jsrain@suse.cz>
 #		Lukas Ocilka <locilka@suse.cz>
-#
-# $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 15:03:29.000000000 +0100
+++ new/yast2-packager-3.1.7/testsuite/tests/DefaultDesktop.out	2014-03-06 14:26:15.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	[]

continue with "q"...


Checked in at Fri Mar 7 17:14:16 CET 2014 by ro

Remember to have fun...

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

ro

tags

participants (1)