August 2017 - openSUSE Commits - openSUSE Mailing Lists

commit vlc for openSUSE:Factory
by root＠hilbert.suse.de 02 Aug '17

02 Aug '17

Hello community, here is the log from the commit of package vlc for openSUSE:Factory checked in at 2017-08-02 11:27:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vlc (Old) and /work/SRC/openSUSE:Factory/.vlc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vlc" Wed Aug 2 11:27:27 2017 rev:70 rq:513117 version:2.2.6 Changes: -------- --- /work/SRC/openSUSE:Factory/vlc/vlc.changes 2017-07-04 09:08:11.369211522 +0200 +++ /work/SRC/openSUSE:Factory/.vlc.new/vlc.changes 2017-08-02 11:27:29.163963852 +0200 @@ -1,0 +2,5 @@ +Mon Jul 24 06:37:10 UTC 2017 - olaf(a)aepfle.de + +- Adjust to API change in a52dec with vlc.a52.patch + +------------------------------------------------------------------- New: ---- vlc.a52.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vlc.spec ++++++ --- /var/tmp/diff_new_pack.pNpwEs/_old 2017-08-02 11:27:30.343797049 +0200 +++ /var/tmp/diff_new_pack.pNpwEs/_new 2017-08-02 11:27:30.351795918 +0200 @@ -57,6 +57,7 @@ Patch5: vlc-support-qt5.5.patch # PATCH-FIX-UPSTREAM vlc-gcc6-buildfixes.patch dimstar(a)opensuse.org -- A collection of upstream commits to fix build with gcc6 Patch6: vlc-gcc6-buildfixes.patch +Patch7: vlc.a52.patch BuildRequires: Mesa-devel BuildRequires: SDL-devel >= 1.2.10 BuildRequires: aalib-devel @@ -358,6 +359,7 @@ if [ $(gcc -dumpversion) -ge 6 ]; then %patch6 -p1 fi +%patch7 -p1 ### Fix up sources for LUA 5.3 if pkg-config --atleast-version 5.3 lua; then ++++++ vlc.a52.patch ++++++ --- a/modules/audio_filter/converter/a52tofloat32.c +++ b/modules/audio_filter/converter/a52tofloat32.c @@ -209,7 +209,7 @@ static int Open( vlc_object_t *p_this, f p_sys->i_flags |= A52_ADJUST_LEVEL; /* Initialize liba52 */ - p_sys->p_liba52 = a52_init( 0 ); + p_sys->p_liba52 = a52_init(); if( p_sys->p_liba52 == NULL ) { msg_Err( p_this, "unable to initialize liba52" );

1 0

commit python-lxml for openSUSE:Factory
by root＠hilbert.suse.de 02 Aug '17

02 Aug '17

Hello community, here is the log from the commit of package python-lxml for openSUSE:Factory checked in at 2017-08-02 11:27:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-lxml (Old) and /work/SRC/openSUSE:Factory/.python-lxml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-lxml" Wed Aug 2 11:27:23 2017 rev:60 rq:513115 version:3.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-lxml/python-lxml.changes 2017-04-19 18:10:13.462945933 +0200 +++ /work/SRC/openSUSE:Factory/.python-lxml.new/python-lxml.changes 2017-08-02 11:27:26.492341562 +0200 @@ -1,0 +2,38 @@ +Fri Jul 28 17:24:27 UTC 2017 - ecsos(a)opensuse.org + +- update to 3.8.0 + Features added + - ElementTree.write() has a new option doctype that writes out + a doctype string before the serialisation, in the same way as + tostring(). + - GH#220: xmlfile allows switching output methods at an element + level. Patch by Burak Arslan. + - LP#1595781, GH#240: added a PyCapsule Python API and C-level + API for passing externally generated libxml2 documents into + lxml. + - GH#244: error log entries have a new property path with an + XPath expression (if known, None otherwise) that points to the + tree element responsible for the error. Patch by Bob Kline. + - The namespace prefix mapping that can be used in ElementPath + now injects a default namespace when passing a None prefix. + Bugs fixed + - GH#238: Character escapes were not hex-encoded in the xmlfile + serialiser. Patch by matejcik. + - GH#229: fix for externally created XML documents. + Patch by Theodore Dubois. + - LP#1665241, GH#228: Form data handling in lxml.html no longer + strips the option values specified in form attributes but only + the text values. Patch by Ashish Kulkarni. + - LP#1551797: revert previous fix for XSLT error logging as it + breaks multi-threaded XSLT processing. + - LP#1673355, GH#233: fromstring() html5parser failed to parse + byte strings. + Other changes + - The previously undocumented docstring option in + ElementTree.write() produces a deprecation warning and will + eventually be removed. +- enable source url for pdf doc +- remove patch lxml-fix-attribute-quoting.patch because it is now + in upstream + +------------------------------------------------------------------- Old: ---- lxml-3.7.3.tar.gz lxml-fix-attribute-quoting.patch lxmldoc-3.7.3.pdf New: ---- lxml-3.8.0.tar.gz lxmldoc-3.8.0.pdf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-lxml.spec ++++++ --- /var/tmp/diff_new_pack.N5t4gp/_old 2017-08-02 11:27:27.252234130 +0200 +++ /var/tmp/diff_new_pack.N5t4gp/_new 2017-08-02 11:27:27.256233564 +0200 @@ -18,17 +18,14 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-lxml -Version: 3.7.3 +Version: 3.8.0 Release: 0 Summary: Powerful and Pythonic XML processing library License: BSD-3-Clause and GPL-2.0+ Group: Development/Languages/Python Url: https://lxml.de/ Source: https://files.pythonhosted.org/packages/source/l/lxml/lxml-%{version}.tar.gz -#Source1: https://lxml.de/lxmldoc-%{version}.pdf -Source1: lxmldoc-%{version}.pdf -# PATCH-FIX-UPSTREAM fix attribute quoting inactive code https://github.com/lxml/lxml/pull/238 -Patch0: lxml-fix-attribute-quoting.patch +Source1: http://lxml.de/lxmldoc-%{version}.pdf BuildRequires: %{python_module Cython >= 0.22.1} BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools >= 18.0.1} @@ -77,7 +74,6 @@ %prep %setup -q -n lxml-%{version} cp %{SOURCE1} . -%patch0 -p1 # remove generated files rm src/lxml/lxml.etree.c ++++++ lxml-3.7.3.tar.gz -> lxml-3.8.0.tar.gz ++++++ ++++ 160163 lines of diff (skipped) ++++++ lxmldoc-3.7.3.pdf -> lxmldoc-3.8.0.pdf ++++++ (binary differes)

1 0

commit virtualbox for openSUSE:Factory
by root＠hilbert.suse.de 02 Aug '17

02 Aug '17

Hello community, here is the log from the commit of package virtualbox for openSUSE:Factory checked in at 2017-08-02 11:27:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virtualbox (Old) and /work/SRC/openSUSE:Factory/.virtualbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virtualbox" Wed Aug 2 11:27:15 2017 rev:138 rq:513097 version:5.1.26 Changes: -------- --- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2017-07-23 12:14:04.766460477 +0200 +++ /work/SRC/openSUSE:Factory/.virtualbox.new/virtualbox.changes 2017-08-02 11:27:20.769150700 +0200 @@ -1,0 +2,17 @@ +Sat Jul 29 20:55:24 UTC 2017 - Larry.Finger(a)lwfinger.net + +- Version bump to 5.1.26 (released 2017-07-27 by Oracle) + +This is a maintenance release. The following items were fixed and/or added: + + VMM: reset the TSC on VM reset to work around a Windows bug (bug #16643) + Audio: fixed memory leak when enabled with VRDP connections (5.1.24 regression; bug #16928) + Audio: fixed creation of too many sound sinks on Linux hosts when using the PulseAudio backend (bug #16938) + Audio: implemented record gain registers for AC'97 emulation; those are needed for newer Ubuntu guests which rely on those when controlling gain and muting the recording (capturing) levels + Storage: fixed hang when using the emulated NVMe controller with the SPDK (bug #16945) + Mouse: double click was not working with a precision touchpad (bug #14632) + Linux hosts: properly bring up host-only network interfaces with iproute (5.1.24 regression; bug #16911) + Linux hosts: provide Python 3 libraries for deb/rpm packages + Windows guests: fixed automatic logons for Vista and newer Windows guests (5.1.24 regression; bug #16921) + +------------------------------------------------------------------- Old: ---- VirtualBox-5.1.24-patched.tar.bz2 New: ---- VirtualBox-5.1.26-patched.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.QPbWMD/_old 2017-08-02 11:27:24.140674038 +0200 +++ /var/tmp/diff_new_pack.QPbWMD/_new 2017-08-02 11:27:24.144673472 +0200 @@ -22,7 +22,7 @@ %define _vbox_instdir %{_libexecdir}/virtualbox %define _udevrulesdir %{_sysconfdir}/udev/rules.d Name: virtualbox -Version: 5.1.24 +Version: 5.1.26 Release: 0 Summary: VirtualBox is an Emulator License: GPL-2.0+ ++++++ UserManual.pdf ++++++ (binary differes) ++++++ VirtualBox-5.1.24-patched.tar.bz2 -> VirtualBox-5.1.26-patched.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/virtualbox/VirtualBox-5.1.24-patched.tar.bz2 /work/SRC/openSUSE:Factory/.virtualbox.new/VirtualBox-5.1.26-patched.tar.bz2 differ: char 11, line 1

1 0

commit aaa_base for openSUSE:Factory
by root＠hilbert.suse.de 02 Aug '17

02 Aug '17

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2017-08-02 11:26:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aaa_base" Wed Aug 2 11:26:59 2017 rev:436 rq:513581 version:13.2+git20170731.c10ca77 Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2017-06-23 09:14:34.414576823 +0200 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2017-08-02 11:27:03.699563982 +0200 @@ -1,0 +2,9 @@ +Mon Jul 31 14:04:10 UTC 2017 - lnussel(a)suse.de + +- Update to version 13.2+git20170731.c10ca77: + * Fix csh.cshrc as tcsh does not handle stderr + * Do not set alias cwdcmd for experts (boo#1045889) + * unset unused variables on profile files (bsc#1049577) + * Deprecate DEFAULT_WM in sysconfig.windowmanager + +------------------------------------------------------------------- Old: ---- aaa_base-13.2+git20170619.afcd428.tar.xz New: ---- aaa_base-13.2+git20170731.c10ca77.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.ubO4ic/_old 2017-08-02 11:27:05.383325932 +0200 +++ /var/tmp/diff_new_pack.ubO4ic/_new 2017-08-02 11:27:05.387325367 +0200 @@ -18,7 +18,7 @@ Name: aaa_base -Version: 13.2+git20170619.afcd428 +Version: 13.2+git20170731.c10ca77 Release: 0 Url: https://github.com/openSUSE/aaa_base Provides: aaa_skel = %{version}-%{release} ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ubO4ic/_old 2017-08-02 11:27:05.435318581 +0200 +++ /var/tmp/diff_new_pack.ubO4ic/_new 2017-08-02 11:27:05.439318017 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/aaa_base.git</param> - <param name="changesrevision">47e703a0981f0a9686ac978a9990dc11eef70873</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">c10ca77e8ecd9de00b061d3f328c28d234d02fc1</param></service></servicedata> \ No newline at end of file ++++++ aaa_base-13.2+git20170619.afcd428.tar.xz -> aaa_base-13.2+git20170731.c10ca77.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20170619.afcd428/files/etc/bash.bashrc new/aaa_base-13.2+git20170731.c10ca77/files/etc/bash.bashrc --- old/aaa_base-13.2+git20170619.afcd428/files/etc/bash.bashrc 2017-06-19 12:54:21.000000000 +0200 +++ new/aaa_base-13.2+git20170731.c10ca77/files/etc/bash.bashrc 2017-07-31 16:04:09.000000000 +0200 @@ -362,6 +362,7 @@ ash) test -s /etc/ash.ashrc.local && . /etc/ash.ashrc.local esac test -s /etc/sh.shrc.local && . /etc/sh.shrc.local +unset is if test "$restricted" = true -a -z "$PROFILEREAD" ; then PATH=/usr/lib/restricted/bin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20170619.afcd428/files/etc/csh.cshrc new/aaa_base-13.2+git20170731.c10ca77/files/etc/csh.cshrc --- old/aaa_base-13.2+git20170619.afcd428/files/etc/csh.cshrc 2017-06-19 12:54:21.000000000 +0200 +++ new/aaa_base-13.2+git20170731.c10ca77/files/etc/csh.cshrc 2017-07-31 16:04:09.000000000 +0200 @@ -112,7 +112,7 @@ # set prompt="%B%m%b %C2%# " if ( -o /dev/$tty && -c /dev/$tty ) then - alias cwdcmd '(echo "Directory: $cwd" > /dev/$tty)' + if ( ! -r $HOME/.csh.expert ) alias cwdcmd '(echo "Directory: $cwd" > /dev/$tty)' if ( -x /usr/bin/biff ) /usr/bin/biff y # If we're running under X11 if ( ${?DISPLAY} ) then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20170619.afcd428/files/etc/csh.login new/aaa_base-13.2+git20170731.c10ca77/files/etc/csh.login --- old/aaa_base-13.2+git20170619.afcd428/files/etc/csh.login 2017-06-19 12:54:21.000000000 +0200 +++ new/aaa_base-13.2+git20170731.c10ca77/files/etc/csh.login 2017-07-31 16:04:09.000000000 +0200 @@ -60,6 +60,7 @@ if (! ${?UID} ) set -r UID=${uid} if (! ${?EUID} ) set -r EUID="`${id} -u`" if (! ${?USER} ) set USER="`${id} -un`" +unset id if (! ${?HOME} ) set HOME="" if (! ${?MAIL} ) setenv MAIL /var/spool/mail/$USER if ( -x /bin/uname ) then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20170619.afcd428/files/etc/profile new/aaa_base-13.2+git20170731.c10ca77/files/etc/profile --- old/aaa_base-13.2+git20170619.afcd428/files/etc/profile 2017-06-19 12:54:21.000000000 +0200 +++ new/aaa_base-13.2+git20170731.c10ca77/files/etc/profile 2017-07-31 16:04:09.000000000 +0200 @@ -383,6 +383,7 @@ date fi esac +unset is # # End of /etc/profile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20170619.afcd428/files/etc/profile.d/profile.csh new/aaa_base-13.2+git20170731.c10ca77/files/etc/profile.d/profile.csh --- old/aaa_base-13.2+git20170619.afcd428/files/etc/profile.d/profile.csh 2017-06-19 12:54:21.000000000 +0200 +++ new/aaa_base-13.2+git20170731.c10ca77/files/etc/profile.d/profile.csh 2017-07-31 16:04:09.000000000 +0200 @@ -157,6 +157,7 @@ endif endif +unset val arr id unset noglob # # end of profile.csh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20170619.afcd428/files/etc/profile.d/profile.sh new/aaa_base-13.2+git20170731.c10ca77/files/etc/profile.d/profile.sh --- old/aaa_base-13.2+git20170619.afcd428/files/etc/profile.d/profile.sh 2017-06-19 12:54:21.000000000 +0200 +++ new/aaa_base-13.2+git20170731.c10ca77/files/etc/profile.d/profile.sh 2017-07-31 16:04:09.000000000 +0200 @@ -137,7 +137,7 @@ WINDOWMANAGER=xterm fi fi -unset DEFAULT_WM +unset DEFAULT_WM line export WINDOWMANAGER if test -n "$CONSOLE_MAGIC" ; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20170619.afcd428/files/var/adm/fillup-templates/sysconfig.windowmanager new/aaa_base-13.2+git20170731.c10ca77/files/var/adm/fillup-templates/sysconfig.windowmanager --- old/aaa_base-13.2+git20170619.afcd428/files/var/adm/fillup-templates/sysconfig.windowmanager 2017-06-19 12:54:21.000000000 +0200 +++ new/aaa_base-13.2+git20170731.c10ca77/files/var/adm/fillup-templates/sysconfig.windowmanager 2017-07-31 16:04:09.000000000 +0200 @@ -1,12 +1,16 @@ ## Path: Desktop/Window manager ## Description: -## Type: string(gnome,kde-plasma,kde,plasma5,lxde,xfce,twm,icewm,enlightenment) -## Default: kde-plasma +## Type: string(default,gnome,plasma5,lxde,xfce,twm,icewm,enlightenment) +## Default: default ## Config: profiles,kde,susewm # # Here you can set the default window manager (kde, fvwm, ...) -# changes here require at least a re-login -DEFAULT_WM="kde-plasma" +# changes here require at least a re-login. +# +# This value is deprecated and not read by most display managers. +# Use 'update-alternatives --config default-xsession.desktop' for configuration instead. + +DEFAULT_WM="default" ## Type: yesno ## Default: yes

1 0

commit yast2-installation for openSUSE:Factory
by root＠hilbert.suse.de 02 Aug '17

02 Aug '17

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2017-08-02 11:26:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Wed Aug 2 11:26:55 2017 rev:389 rq:513533 version:3.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2017-07-02 13:32:19.160631907 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2017-08-02 11:26:58.140349940 +0200 @@ -1,0 +2,26 @@ +Mon Jul 31 08:16:23 UTC 2017 - jreidinger(a)suse.com + +- New client for product selection (FATE#323450) +- 3.3.3 + +------------------------------------------------------------------- +Wed Jul 26 14:42:15 UTC 2017 - jreidinger(a)suse.com + +- drop reading /content (FATE#322386) +- 3.3.2 + +------------------------------------------------------------------- +Thu Jun 29 11:51:55 UTC 2017 - jreidinger(a)suse.com + +- openSUSE only: reword title of desktop selection dialog + (boo#1045180) +- 3.3.1 + +------------------------------------------------------------------- +Thu Jun 29 08:40:43 UTC 2017 - jreidinger(a)suse.com + +- when custom role is selected in desktop selection + keep default value in /etc/sysconfig/windowmanager (bsc#1030873) +- 3.3.0 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.2.46.tar.bz2 New: ---- yast2-installation-3.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.oluJi1/_old 2017-08-02 11:26:58.712269082 +0200 +++ /var/tmp/diff_new_pack.oluJi1/_new 2017-08-02 11:26:58.716268517 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.2.46 +Version: 3.3.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-3.2.46.tar.bz2 -> yast2-installation-3.3.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/package/yast2-installation.changes new/yast2-installation-3.3.3/package/yast2-installation.changes --- old/yast2-installation-3.2.46/package/yast2-installation.changes 2017-06-26 17:11:22.374338830 +0200 +++ new/yast2-installation-3.3.3/package/yast2-installation.changes 2017-07-31 15:08:34.387704126 +0200 @@ -1,4 +1,30 @@ ------------------------------------------------------------------- +Mon Jul 31 08:16:23 UTC 2017 - jreidinger(a)suse.com + +- New client for product selection (FATE#323450) +- 3.3.3 + +------------------------------------------------------------------- +Wed Jul 26 14:42:15 UTC 2017 - jreidinger(a)suse.com + +- drop reading /content (FATE#322386) +- 3.3.2 + +------------------------------------------------------------------- +Thu Jun 29 11:51:55 UTC 2017 - jreidinger(a)suse.com + +- openSUSE only: reword title of desktop selection dialog + (boo#1045180) +- 3.3.1 + +------------------------------------------------------------------- +Thu Jun 29 08:40:43 UTC 2017 - jreidinger(a)suse.com + +- when custom role is selected in desktop selection + keep default value in /etc/sysconfig/windowmanager (bsc#1030873) +- 3.3.0 + +------------------------------------------------------------------- Mon Jun 26 11:11:19 CEST 2017 - shundhammer(a)suse.de - Allow different mount point for home partition (Fate#323532) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/package/yast2-installation.spec new/yast2-installation-3.3.3/package/yast2-installation.spec --- old/yast2-installation-3.2.46/package/yast2-installation.spec 2017-06-26 17:11:22.374338830 +0200 +++ new/yast2-installation-3.3.3/package/yast2-installation.spec 2017-07-31 15:08:34.387704126 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.2.46 +Version: 3.3.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/src/clients/desktop_finish.rb new/yast2-installation-3.3.3/src/clients/desktop_finish.rb --- old/yast2-installation-3.2.46/src/clients/desktop_finish.rb 2017-06-26 17:11:22.406338830 +0200 +++ new/yast2-installation-3.3.3/src/clients/desktop_finish.rb 2017-07-31 15:08:34.467704126 +0200 @@ -1,2 +1,2 @@ require "installation/clients/desktop_finish" -Yast::DesktopFinishClient.new.main +Yast::DesktopFinishClient.run diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/src/clients/inst_product_selector.rb new/yast2-installation-3.3.3/src/clients/inst_product_selector.rb --- old/yast2-installation-3.2.46/src/clients/inst_product_selector.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.3.3/src/clients/inst_product_selector.rb 2017-07-31 15:08:34.495704126 +0200 @@ -0,0 +1,5 @@ +require "yast" + +require "installation/dialogs/product_selection" + +::Installation::Dialogs::ProductSelection.run diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/src/lib/installation/clients/desktop_finish.rb new/yast2-installation-3.3.3/src/lib/installation/clients/desktop_finish.rb --- old/yast2-installation-3.2.46/src/lib/installation/clients/desktop_finish.rb 2017-06-26 17:11:22.418338830 +0200 +++ new/yast2-installation-3.3.3/src/lib/installation/clients/desktop_finish.rb 2017-07-31 15:08:34.555704126 +0200 @@ -31,230 +31,98 @@ # $Id$ # -module Yast - class DesktopFinishClient < Client - def main - Yast.import "Pkg" +require "installation/finish_client" +require "yast2/execute" + +Yast.import "DefaultDesktop" +Yast.import "ProductFeatures" +Yast.import "FileUtils" +module Yast + class DesktopFinishClient < ::Installation::FinishClient + def initialize textdomain "installation" + end + + def title + _("Initializing default window manager...") + end + + def modes + [:installation, :autoinst] + end + + def write + selected_desktop = DefaultDesktop.Desktop + log.info "Selected desktop: #{selected_desktop}" + + if selected_desktop.nil? + log.info "no desktop set, skipping." + return nil + end + + desktop_map = DefaultDesktop.GetAllDesktopsMap[selected_desktop] + raise "Selected desktop '#{selected_desktop}' missing in desktops map" unless desktop_map + + log.info "selected desktop #{desktop_map}" - Yast.import "DefaultDesktop" - Yast.import "Directory" - Yast.import "Mode" - Yast.import "ProductFeatures" - Yast.import "FileUtils" - Yast.import "String" - - @ret = nil - @func = "" - @param = {} - - # Check arguments - if Ops.greater_than(Builtins.size(WFM.Args), 0) && - Ops.is_string?(WFM.Args(0)) - @func = Convert.to_string(WFM.Args(0)) - if Ops.greater_than(Builtins.size(WFM.Args), 1) && - Ops.is_map?(WFM.Args(1)) - @param = Convert.to_map(WFM.Args(1)) - end + default_dm = desktop_map["logon"] || "" + default_wm = desktop_map["desktop"] || "" + default_cursor = desktop_map["cursor"] || "" + + SCR.Write(path(".sysconfig.windowmanager.DEFAULT_WM"), default_wm) + SCR.Write( + path(".sysconfig.windowmanager.X_MOUSE_CURSOR"), + default_cursor + ) + SCR.Write(path(".sysconfig.windowmanager"), nil) + + dpmng_file = "/etc/sysconfig/displaymanager" + # Creates an empty sysconfig file if it doesn't exist + if !FileUtils.Exists(dpmng_file) && + FileUtils.Exists("/usr/bin/touch") + log.info "Creating file #{dpmng_file}" + Yast::Execute.on_target("/usr/bin/touch", dpmng_file) end - Builtins.y2milestone("starting desktop_finish") - Builtins.y2debug("func=%1", @func) - Builtins.y2debug("param=%1", @param) - - if @func == "Info" - return { - "steps" => 1, - # progress step title - "title" => _( - "Initializing default window manager..." - ), - "when" => [:installation, :autoinst] - } - elsif @func == "Write" - # this detects WM and DM according to selected patterns and - # installed packages - if !Mode.update - @dd_map = DefaultDesktop.GetAllDesktopsMap - - @selected_desktop = DefaultDesktop.Desktop - Builtins.y2milestone("Selected desktop: %1", @selected_desktop) - - if @selected_desktop.nil? || @selected_desktop == "" - @selected_desktop = "gnome" - end - - @default_dm = "" - @default_wm = "" - @default_cursor = "" - - @desktop_order = [] - @dorder_map = {} - - # build a map $[desktop_id -> desktop_order] - Builtins.foreach(@dd_map) do |desktop_id, desktop_def| - @desktop_order = Builtins.add(@desktop_order, desktop_id) - Ops.set( - @dorder_map, - desktop_id, - desktop_def["order"] || 9999 - ) - end - - # sort the desktops according to their order - @desktop_order = Builtins.sort(@desktop_order) do |desktop_x, desktop_y| - Ops.less_than( - Ops.get(@dorder_map, desktop_x, 9999), - Ops.get(@dorder_map, desktop_y, 9999) - ) - end - - # the default one is always the first one - @desktop_order = Builtins.prepend( - @desktop_order, - DefaultDesktop.Desktop - ) - Builtins.y2milestone("Desktop order: %1", @desktop_order) - - @desktop_found = false - - Builtins.foreach(@desktop_order) do |d| - raise Break if @desktop_found - Builtins.y2milestone("Checking desktop: %1", d) - Builtins.foreach(Ops.get_list(@dd_map, [d, "packages"], [])) do |package| - if Pkg.IsProvided(package) && - (Pkg.PkgInstalled(package) || Pkg.IsSelected(package)) - Builtins.y2milestone( - "Package %1 selected or installed, desktop %2 matches", - package, - d - ) - @desktop_found = true - - @default_dm = Ops.get_string(@dd_map, [d, "logon"], "") - Builtins.y2milestone( - "Setting logon manager %1 - package selected", - @default_dm - ) - - @default_wm = Ops.get_string(@dd_map, [d, "desktop"], "") - Builtins.y2milestone( - "Setting window manager %1 - package selected", - @default_wm - ) - - @default_cursor = Ops.get_string( - @dd_map, - [d, "cursor"], - @default_cursor - ) - Builtins.y2milestone( - "Setting cursor theme %1 - package selected", - @default_cursor - ) - else - Builtins.y2milestone( - "Package %1 for desktop %2 neither selected nor installed, trying next desktop...", - package, - d - ) - end - end - end - - Builtins.y2milestone("Default desktop: %1", @default_wm) - Builtins.y2milestone("Default logon manager: %1", @default_dm) - Builtins.y2milestone("Default cursor theme: %1", @default_cursor) - - SCR.Write(path(".sysconfig.windowmanager.DEFAULT_WM"), @default_wm) - SCR.Write( - path(".sysconfig.windowmanager.X_MOUSE_CURSOR"), - @default_cursor - ) - SCR.Write(path(".sysconfig.windowmanager"), nil) - - @dpmng_file = "/etc/sysconfig/displaymanager" - # Creates an empty sysconfig file if it doesn't exist - if !FileUtils.Exists(@dpmng_file) && - FileUtils.Exists("/usr/bin/touch") - Builtins.y2milestone( - "Creating file %1: %2", - @dpmng_file, - SCR.Execute( - path(".target.bash"), - Builtins.sformat( - "/usr/bin/touch '%1'", - String.Quote(@dpmng_file) - ) - ) - ) - end - - # this one should be obsolete nowadays but maybe KDE still uses it - @dm_shutdown = ProductFeatures.GetStringFeature( - "globals", - "displaymanager_shutdown" - ) - Builtins.y2milestone("Logon manager shutdown: %1", @dm_shutdown) - if !(a)dm_shutdown.nil? && @dm_shutdown != "" - SCR.Write( - path(".sysconfig.displaymanager.DISPLAYMANAGER_SHUTDOWN"), - @dm_shutdown - ) - end - - Builtins.y2milestone( - "sysconfig/displaymanager/DISPLAYMANAGER=%1", - @default_dm - ) - SCR.Write( - path(".sysconfig.displaymanager.DISPLAYMANAGER"), - @default_dm - ) - SCR.Write(path(".sysconfig.displaymanager"), nil) - - # bnc #431158, patch done by lnussel - @polkit_default_privs = ProductFeatures.GetStringFeature( - "globals", - "polkit_default_privs" - ) - if !(a)polkit_default_privs.nil? && @polkit_default_privs != "" - Builtins.y2milestone( - "Writing %1 to POLKIT_DEFAULT_PRIVS", - @polkit_default_privs - ) - SCR.Write( - path(".sysconfig.security.POLKIT_DEFAULT_PRIVS"), - @polkit_default_privs - ) - # BNC #440182 - # Flush the SCR cache before calling the script - SCR.Write(path(".sysconfig.security"), nil) - - @ret2 = Convert.to_map( - SCR.Execute( - path(".target.bash_output"), - # check whether it exists - # give some feedback - # It's dozens of lines... - "test -x /sbin/set_polkit_default_privs && " \ - "echo /sbin/set_polkit_default_privs && " \ - "/sbin/set_polkit_default_privs | wc -l && " \ - "echo 'Done'" - ) - ) - Builtins.y2milestone("Command returned: %1", @ret2) - end - end - else - Builtins.y2error("unknown function: %1", @func) - @ret = nil + SCR.Write( + path(".sysconfig.displaymanager.DISPLAYMANAGER"), + default_dm + ) + SCR.Write(path(".sysconfig.displaymanager"), nil) + + # bnc #431158, patch done by lnussel + polkit_default_privs = ProductFeatures.GetStringFeature( + "globals", + "polkit_default_privs" + ) + if !polkit_default_privs.nil? && polkit_default_privs != "" + Builtins.y2milestone( + "Writing %1 to POLKIT_DEFAULT_PRIVS", + polkit_default_privs + ) + SCR.Write( + path(".sysconfig.security.POLKIT_DEFAULT_PRIVS"), + polkit_default_privs + ) + # BNC #440182 + # Flush the SCR cache before calling the script + SCR.Write(path(".sysconfig.security"), nil) + + ret2 = SCR.Execute( + path(".target.bash_output"), + # check whether it exists + # give some feedback + # It's dozens of lines... + "test -x /sbin/set_polkit_default_privs && " \ + "echo /sbin/set_polkit_default_privs && " \ + "/sbin/set_polkit_default_privs | wc -l && " \ + "echo 'Done'" + ) + log.info "Command returned: #{ret2}" end - Builtins.y2debug("ret=%1", @ret) - Builtins.y2milestone("desktop_finish finished") - deep_copy(@ret) + nil end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/src/lib/installation/clients/inst_install_inf.rb new/yast2-installation-3.3.3/src/lib/installation/clients/inst_install_inf.rb --- old/yast2-installation-3.2.46/src/lib/installation/clients/inst_install_inf.rb 2017-06-26 17:11:22.466338830 +0200 +++ new/yast2-installation-3.3.3/src/lib/installation/clients/inst_install_inf.rb 2017-07-31 15:08:34.623704126 +0200 @@ -50,7 +50,7 @@ case new_url when :cancel if Popup.YesNo(_("If you decide to cancel, the custom URL\n" \ - "will be completelly ignored.\n\n" \ + "will be completely ignored.\n\n" \ "Really cancel URL modification?")) regurl = nil end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/src/lib/installation/dialogs/desktop_roles.rb new/yast2-installation-3.3.3/src/lib/installation/dialogs/desktop_roles.rb --- old/yast2-installation-3.2.46/src/lib/installation/dialogs/desktop_roles.rb 2017-06-26 17:11:22.470338830 +0200 +++ new/yast2-installation-3.3.3/src/lib/installation/dialogs/desktop_roles.rb 2017-07-31 15:08:34.691704126 +0200 @@ -22,7 +22,7 @@ loop do ret = Yast::CWM.show( content, - caption: _("Computer Role"), + caption: _("User Interface"), skip_store_for: [:redraw] ) break if ret != :redraw diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/src/lib/installation/dialogs/product_selection.rb new/yast2-installation-3.3.3/src/lib/installation/dialogs/product_selection.rb --- old/yast2-installation-3.2.46/src/lib/installation/dialogs/product_selection.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.3.3/src/lib/installation/dialogs/product_selection.rb 2017-07-31 15:08:34.691704126 +0200 @@ -0,0 +1,57 @@ +require "yast" + +require "cwm/dialog" +require "installation/widgets/product_selector" +require "installation/product_reader" + +Yast.import "ProductControl" +Yast.import "WorkflowManager" + +module Installation + module Dialogs + # The dialog is used to select from available product that can do system installation. + # Currently it is mainly used for LeanOS that have on one media more products. + class ProductSelection < CWM::Dialog + class << self + attr_accessor :selected_package + end + + def initialize + textdomain "installation" + end + + def title + _("Product Selection") + end + + def products + ProductReader.available_base_products + end + + def selector + @selector ||= Widgets::ProductSelector.new(products) + end + + def contents + VBox(selector) + end + + # enhances default run by additional action if next is pressed + def run + return if super != :next + + # remove already selected if it is not first run of dialog + if self.class.selected_package + Yast::WorkflowManager.RemoveWorkflow(:package, 0, self.class.selected_package) + end + product = selector.product + Yast::WorkflowManager.AddWorkflow(:package, 0, product.installation_package) + Yast::WorkflowManager.MergeWorkflows + Yast::WorkflowManager.RedrawWizardSteps + self.class.selected_package = product.installation_package + # run new steps for product + Yast::ProductControl.RunFrom(Yast::ProductControl.CurrentStep + 1, true) + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/src/lib/installation/product.rb new/yast2-installation-3.3.3/src/lib/installation/product.rb --- old/yast2-installation-3.2.46/src/lib/installation/product.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.3.3/src/lib/installation/product.rb 2017-07-31 15:08:34.691704126 +0200 @@ -0,0 +1,54 @@ +# ------------------------------------------------------------------------------ +# Copyright (c) 2017 SUSE LLC, All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# ------------------------------------------------------------------------------ + +require "yast" +Yast.import "Pkg" + +module Installation + # Simple Libzypp Product wrapper + class Product + include Yast::Logger + + # @return [String] the internal libzypp product name + attr_reader :name + # @return [String] the human readable product label + attr_reader :label + # @return [Integer, nil] the display order (nil if not defined) + attr_reader :order + # package including installation.xml for install on top of lean os + attr_accessor :installation_package + + # @param name [String] name of the product resolvable + # @param label [String] user visible product label + # @param order [Integer,nil] the display order + def initialize(name, label, order: nil) + @name = name + @label = label + @order = order + end + + # select the product to install + # @return [Boolean] true if the product has been sucessfully selected + def select + log.info "Selecting product #{name} to install" + Yast::Pkg.ResolvableInstall(name, :product, "") + end + + # is the product selected to install? + # @return [Boolean] true if it is selected + def selected? + Yast::Pkg.ResolvableProperties(name, :product, "").any? do |res| + res["status"] == :selected + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/src/lib/installation/product_reader.rb new/yast2-installation-3.3.3/src/lib/installation/product_reader.rb --- old/yast2-installation-3.2.46/src/lib/installation/product_reader.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.3.3/src/lib/installation/product_reader.rb 2017-07-31 15:08:34.691704126 +0200 @@ -0,0 +1,102 @@ +# ------------------------------------------------------------------------------ +# Copyright (c) 2017 SUSE LLC, All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# ------------------------------------------------------------------------------ + +require "yast" +require "installation/product" +require "installation/product_sorter" + +Yast.import "Pkg" + +module Installation + # Read the product information from libzypp + class ProductReader + include Yast::Logger + + # In installation Read the available libzypp base products for installation + # @return [Array<Installation::Product>] the found available base products, + # the products are sorted by the 'displayorder' provides value + def self.available_base_products + products = base_products + + installation_mapping = installation_package_mapping + result = products.map do |prod| + label = prod["display_name"] || prod["short_name"] || prod["name"] + prod_pkg = product_package(prod["product_package"], prod["source"]) + + if prod_pkg + prod_pkg["deps"].find { |dep| dep["provides"] =~ /\Adisplayorder$\s*([0-9]+)\s*$\z/ } + displayorder = Regexp.last_match[1].to_i if Regexp.last_match + end + + product = Product.new(prod["name"], label, order: displayorder) + product.installation_package = installation_mapping[product.name] + product + end + + # only installable products + result.select!(&:installation_package) + + # sort the products + result.sort!(&::Installation::PRODUCT_SORTER) + + log.info "available base products #{result}" + + result + end + + def self.product_package(name, repo_id) + return nil unless name + Yast::Pkg.ResolvableDependencies(name, :package, "").find do |prod| + prod["source"] == repo_id + end + end + + # read the available base products + # @return [Array<Hash>] pkg-bindings data structure + def self.base_products + products = Yast::Pkg.ResolvableProperties("", :product, "").select do |prod| + prod["source"] == 0 + end + + # remove duplicates, there migth be different flavors ("DVD"/"POOL") + # or archs (x86_64/i586) + products.uniq! { |prod| prod["name"] } + + log.info "Found products: #{products.map { |prod| prod["name"] }}" + + products + end + + def self.installation_package_mapping + installation_packages = Yast::Pkg.PkgQueryProvides("system-installation()") + + mapping = {} + installation_packages.each do |list| + pkg_name = list.first + # There can be more instances of same package in different version. We except that one + # package provide same product installation. So we just pick the first one. + dependencies = Yast::Pkg.ResolvableDependencies(pkg_name, :package, "").first["deps"] + install_provide = dependencies.find do |d| + d["provides"] && d["provides"].match(/system-installation/) + end + + # parse product name from provides. Format of provide is + # `system-installation() = <product_name>` + product_name = install_provide["provides"][/system-installation\s*=\s*(\S+)/, 1] + log.info "package #{pkg_name} install product #{product_name}" + mapping[product_name] = pkg_name + end + + mapping + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/src/lib/installation/product_sorter.rb new/yast2-installation-3.3.3/src/lib/installation/product_sorter.rb --- old/yast2-installation-3.2.46/src/lib/installation/product_sorter.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.3.3/src/lib/installation/product_sorter.rb 2017-07-31 15:08:34.691704126 +0200 @@ -0,0 +1,30 @@ +# ------------------------------------------------------------------------------ +# Copyright (c) 2017 SUSE LLC, All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# ------------------------------------------------------------------------------ + +module Installation + # Sorter for sorting Products in required display order + # @param x [Installation::Product] the first item to compare + # @param y [Installation::Product] the second item to compare + PRODUCT_SORTER = proc do |x, y| + # both products have defined order + if x.order && y.order + x.order <=> y.order + # only one product has defined order + elsif x.order || y.order + # product with defined order first + x.order ? -1 : 1 + else + # none product has defined order, sort by label + x.label <=> y.label + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/src/lib/installation/widgets/product_selector.rb new/yast2-installation-3.3.3/src/lib/installation/widgets/product_selector.rb --- old/yast2-installation-3.2.46/src/lib/installation/widgets/product_selector.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.3.3/src/lib/installation/widgets/product_selector.rb 2017-07-31 15:08:34.711704126 +0200 @@ -0,0 +1,59 @@ +require "yast" +Yast.import "Pkg" +Yast.import "Popup" + +require "cwm/common_widgets" + +module Installation + module Widgets + class ProductSelector < CWM::RadioButtons + include Yast::Logger + + attr_reader :items, :products + attr_reader :product + + # @param products [Array<Installation::Product>] to display + def initialize(products) + @products = products + @items = products.map { |p| [p.name, p.label] } + textdomain "installation" + end + + def hspacing + 1 + end + + def label + _("Product to Install") + end + + def init + selected = products.find(&:selected?) + return unless selected + + self.value = selected.name + end + + def store + log.info "Selected product: #{value}" + @product = products.find { |p| p.name == value } + log.info "Found product: #{@product}" + + return unless @product + + # reset both YaST and user selection (when going back or any products + # selected by YaST in the previous steps) + Yast::Pkg.PkgApplReset + Yast::Pkg.PkgReset + @product.select + end + + def validation + return true if value + + Yast::Popup.Error(_("Please select a product to install.")) + false + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/startup/First-Stage/F04-language new/yast2-installation-3.3.3/startup/First-Stage/F04-language --- old/yast2-installation-3.2.46/startup/First-Stage/F04-language 2017-06-26 17:11:22.570338830 +0200 +++ new/yast2-installation-3.3.3/startup/First-Stage/F04-language 2017-07-31 15:08:34.735704126 +0200 @@ -6,10 +6,6 @@ # 4) set language environment #--------------------------------------------- LANGUAGE=en_US -infofile=/content -if [ -f $infofile ];then - LANGUAGE=`sed -n 's/^LANGUAGE $[^ ]*$/\1/p' $infofile` -fi if [ ! "$Locale" = "" ];then LANGUAGE=$Locale fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/test/desktop_finish_test.rb new/yast2-installation-3.3.3/test/desktop_finish_test.rb --- old/yast2-installation-3.2.46/test/desktop_finish_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.3.3/test/desktop_finish_test.rb 2017-07-31 15:08:34.795704126 +0200 @@ -0,0 +1,68 @@ +require_relative "test_helper" +require "installation/clients/desktop_finish" + +describe Yast::DesktopFinishClient do + describe "#title" do + it "returns translated string" do + expect(subject.title).to be_a(::String) + end + end + + describe "#modes" do + it "runs in installation" do + expect(subject.modes).to include(:installation) + end + + it "runs in autoinstallation" do + expect(subject.modes).to include(:autoinst) + end + + it "does not run in update" do + expect(subject.modes).to_not include(:update) + end + end + + describe "#write" do + before do + allow(Yast::DefaultDesktop).to receive(:Desktop).and_return("gnome") + allow(Yast::DefaultDesktop).to receive(:GetAllDesktopsMap) + .and_return("gnome" => { + "logon" => "gdm", + "cursor" => "DMZ", + "desktop" => "gnome" + }) + + allow(Yast::SCR).to receive(:Write) + allow(Yast::Execute).to receive(:on_target) + end + + it "do nothing if no desktop is selected" do + allow(Yast::DefaultDesktop).to receive(:Desktop).and_return(nil) + expect(Yast::SCR).to_not receive(:Write) + expect(Yast::Execute).to_not receive(:on_target) + + subject.write + end + + it "writes default wm for selected desktop" do + expect(Yast::SCR).to receive(:Write) + .with(path(".sysconfig.windowmanager.DEFAULT_WM"), "gnome") + + subject.write + end + + it "writes cursor for selected desktop" do + expect(Yast::SCR).to receive(:Write) + .with(path(".sysconfig.windowmanager.X_MOUSE_CURSOR"), "DMZ") + + subject.write + end + + it "writes desktop manager for selected desktop" do + expect(Yast::SCR).to receive(:Write) + .with(path(".sysconfig.displaymanager.DISPLAYMANAGER"), "gdm") + + subject.write + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/test/dialogs/product_selection_test.rb new/yast2-installation-3.3.3/test/dialogs/product_selection_test.rb --- old/yast2-installation-3.2.46/test/dialogs/product_selection_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.3.3/test/dialogs/product_selection_test.rb 2017-07-31 15:08:34.795704126 +0200 @@ -0,0 +1,9 @@ +require_relative "../test_helper" + +require "cwm/rspec" + +require "installation/dialogs/product_selection" + +describe ::Installation::Dialogs::ProductSelection do + include_examples "CWM::Dialog" +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/test/fixtures/products/sles15.yml new/yast2-installation-3.3.3/test/fixtures/products/sles15.yml --- old/yast2-installation-3.2.46/test/fixtures/products/sles15.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.3.3/test/fixtures/products/sles15.yml 2017-07-31 15:08:34.799704126 +0200 @@ -0,0 +1,42 @@ +--- +- arch: x86_64 + category: addon + description: |- + SUSE Linux Enterprise offers a comprehensive + suite of products built on a single code base. + The platform addresses business needs from + the smallest thin-client devices to the world's + most powerful high-performance computing + and mainframe servers. SUSE Linux Enterprise + offers common management tools and technology + certifications across the platform, and + each product is enterprise-class. + display_name: SUSE Linux Enterprise Server 15 Alpha1 + download_size: 0 + flags: [] + flavor: '' + inst_size: 0 + locked: false + medium_nr: 0 + name: SLES + on_system_by_user: false + product_file: SLES.prod + product_line: '' + product_package: sles-release + register_release: '' + register_target: sle-15-x86_64 + relnotes_url: https://www.suse.com/releasenotes/x86_64/SUSE-SLES/15/release-notes-sles.rpm + relnotes_urls: + - https://www.suse.com/releasenotes/x86_64/SUSE-SLES/15/release-notes-sles.rpm + short_name: SLES15 + source: 0 + status: :selected + summary: SUSE Linux Enterprise Server 15 Alpha1 + transact_by: :app_high + type: addon + update_urls: [] + vendor: SUSE LINUX Products GmbH, Nuernberg, Germany + version: 15-0 + version_epoch: + version_release: '0' + version_version: '15' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/test/fixtures/products/sles15_release_deps.yml new/yast2-installation-3.3.3/test/fixtures/products/sles15_release_deps.yml --- old/yast2-installation-3.2.46/test/fixtures/products/sles15_release_deps.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.3.3/test/fixtures/products/sles15_release_deps.yml 2017-07-31 15:08:34.799704126 +0200 @@ -0,0 +1,360 @@ +--- +- arch: x86_64 + dependencies: + - dep_kind: conflicts + name: sle-we-release + res_kind: package + - dep_kind: conflicts + name: sled-release + res_kind: package + - dep_kind: conflicts + name: leanos-release + res_kind: package + - dep_kind: obsoletes + name: leanos-release + res_kind: package + - dep_kind: prerequires + name: glibc + res_kind: package + - dep_kind: prerequires + name: bash + res_kind: package + - dep_kind: prerequires + name: coreutils + res_kind: package + - dep_kind: provides + name: sle-we-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-moleculars-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-module-server-applications-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-module-scripting-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-module-legacy-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-module-development-tools-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-module-desktop-applications-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-module-basesystem-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-ha-geo-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-module-scripting-release + res_kind: package + - dep_kind: provides + name: sle-module-legacy-release + res_kind: package + - dep_kind: provides + name: sle-module-development-tools-release + res_kind: package + - dep_kind: provides + name: sle-module-desktop-applications-release + res_kind: package + - dep_kind: provides + name: sle-module-basesystem-release + res_kind: package + - dep_kind: provides + name: SLES-SP1-migration + res_kind: package + - dep_kind: provides + name: leanos-release + res_kind: package + - dep_kind: provides + name: sle-moleculars-release + res_kind: package + - dep_kind: provides + name: sle-ha-geo-release + res_kind: package + - dep_kind: provides + name: sle-ha-release + res_kind: package + - dep_kind: provides + name: sled-release + res_kind: package + - dep_kind: provides + name: sle-module-server-applications-release + res_kind: package + - dep_kind: provides + name: sle-ha-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-we-release + res_kind: package + - dep_kind: provides + name: openSUSE-release + res_kind: package + - dep_kind: provides + name: sles-release + res_kind: package + - dep_kind: provides + name: SLED-SP1-migration + res_kind: package + - dep_kind: provides + name: leanos-SP1-migration + res_kind: package + - dep_kind: recommends + name: branding-SLE + res_kind: package + - dep_kind: recommends + name: branding-openSUSE + res_kind: package + - dep_kind: requires + name: glibc + res_kind: package + - dep_kind: requires + name: coreutils + res_kind: package + - dep_kind: requires + name: issue-generator + res_kind: package + - dep_kind: requires + name: bash + res_kind: package + deps: + - conflicts: leanos-release + - conflicts: sled-release + - conflicts: kernel < 4.4 + - conflicts: perl-Bootloader < 0.904 + - obsoletes: leanos-release + - prerequires: "/bin/sh" + - prerequires: coreutils + - prerequires: glibc >= 2.22 + - provides: product-endoflife() + - provides: distribution-release + - provides: displayorder(200) + - provides: sles-release-15 + - provides: product(SUSE_SLE) = 15 + - provides: product-register-target() = sle%2D15%2Dx86_64 + - provides: product(SUSE_SLE-SP0) = 15 + - provides: product(SUSE_SLE) = 15-80.1 + - provides: product(SUSE_SLE-SP0) = 15-80.1 + - provides: product(SLES) = 15-0 + - provides: product() = SLES + - provides: product-cpeid() = cpe%3A%2Fo%3Asuse%3Asles%3A15 + - provides: product-label() = SLES15 + - provides: config(sles-release) = 15-80.1 + - provides: sles-release = 15-80.1 + - provides: product-url(releasenotes) = https%3A%2F%2Fwww.suse.com%2Freleasenotes%2Fx86_64%2FSUSE%2DSLES%2F15%2Frelease%2Dnotes%2Dsles.rpm + - provides: sles-release(x86-64) = 15-80.1 + - recommends: branding + - requires: issue-generator + - requires: "/bin/sh" + - requires: coreutils + - requires: glibc >= 2.22 + description: |- + SUSE Linux Enterprise offers a comprehensive + suite of products built on a single code base. + The platform addresses business needs from + the smallest thin-client devices to the world's + most powerful high-performance computing + and mainframe servers. SUSE Linux Enterprise + offers common management tools and technology + certifications across the platform, and + each product is enterprise-class. + download_size: 23849 + inst_size: 76384 + location: sles-release-15-80.1.x86_64.rpm + locked: false + medium_nr: 0 + name: sles-release + on_system_by_user: false + path: "./x86_64/sles-release-15-80.1.x86_64.rpm" + source: 0 + status: :available + summary: SUSE Linux Enterprise Server 15 Alpha1 + transact_by: :solver + vendor: SUSE LINUX Products GmbH, Nuernberg, Germany + version: 15-80.1 + version_epoch: + version_release: '80.1' + version_version: '15' +- arch: i586 + dependencies: + - dep_kind: conflicts + name: sle-we-release + res_kind: package + - dep_kind: conflicts + name: sled-release + res_kind: package + - dep_kind: conflicts + name: leanos-release + res_kind: package + - dep_kind: obsoletes + name: leanos-release + res_kind: package + - dep_kind: prerequires + name: glibc + res_kind: package + - dep_kind: prerequires + name: bash + res_kind: package + - dep_kind: prerequires + name: coreutils + res_kind: package + - dep_kind: provides + name: sle-we-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-moleculars-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-module-server-applications-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-module-scripting-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-module-legacy-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-module-development-tools-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-module-desktop-applications-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-module-basesystem-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-ha-geo-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-module-scripting-release + res_kind: package + - dep_kind: provides + name: sle-module-legacy-release + res_kind: package + - dep_kind: provides + name: sle-module-development-tools-release + res_kind: package + - dep_kind: provides + name: sle-module-desktop-applications-release + res_kind: package + - dep_kind: provides + name: sle-module-basesystem-release + res_kind: package + - dep_kind: provides + name: SLES-SP1-migration + res_kind: package + - dep_kind: provides + name: leanos-release + res_kind: package + - dep_kind: provides + name: sle-moleculars-release + res_kind: package + - dep_kind: provides + name: sle-ha-geo-release + res_kind: package + - dep_kind: provides + name: sle-ha-release + res_kind: package + - dep_kind: provides + name: sled-release + res_kind: package + - dep_kind: provides + name: sle-module-server-applications-release + res_kind: package + - dep_kind: provides + name: sle-ha-SP1-migration + res_kind: package + - dep_kind: provides + name: sle-we-release + res_kind: package + - dep_kind: provides + name: openSUSE-release + res_kind: package + - dep_kind: provides + name: sles-release + res_kind: package + - dep_kind: provides + name: SLED-SP1-migration + res_kind: package + - dep_kind: provides + name: leanos-SP1-migration + res_kind: package + - dep_kind: recommends + name: branding-SLE + res_kind: package + - dep_kind: recommends + name: branding-openSUSE + res_kind: package + - dep_kind: requires + name: glibc + res_kind: package + - dep_kind: requires + name: coreutils + res_kind: package + - dep_kind: requires + name: issue-generator + res_kind: package + - dep_kind: requires + name: bash + res_kind: package + deps: + - conflicts: leanos-release + - conflicts: sled-release + - conflicts: kernel < 4.4 + - conflicts: perl-Bootloader < 0.904 + - obsoletes: leanos-release + - prerequires: "/bin/sh" + - prerequires: coreutils + - prerequires: glibc >= 2.22 + - provides: product-endoflife() + - provides: distribution-release + - provides: displayorder(200) + - provides: sles-release-15 + - provides: product(SUSE_SLE) = 15 + - provides: product(SUSE_SLE-SP0) = 15 + - provides: product(SUSE_SLE) = 15-80.1 + - provides: product(SUSE_SLE-SP0) = 15-80.1 + - provides: product(SLES) = 15-0 + - provides: product() = SLES + - provides: product-cpeid() = cpe%3A%2Fo%3Asuse%3Asles%3A15 + - provides: product-label() = SLES15 + - provides: config(sles-release) = 15-80.1 + - provides: sles-release = 15-80.1 + - provides: product-url(releasenotes) = https%3A%2F%2Fwww.suse.com%2Freleasenotes%2Fi586%2FSUSE%2DSLES%2F15%2Frelease%2Dnotes%2Dsles.rpm + - provides: sles-release(x86-32) = 15-80.1 + - recommends: branding + - requires: issue-generator + - requires: "/bin/sh" + - requires: coreutils + - requires: glibc >= 2.22 + description: |- + SUSE Linux Enterprise offers a comprehensive + suite of products built on a single code base. + The platform addresses business needs from + the smallest thin-client devices to the world's + most powerful high-performance computing + and mainframe servers. SUSE Linux Enterprise + offers common management tools and technology + certifications across the platform, and + each product is enterprise-class. + download_size: 23806 + inst_size: 76341 + location: sles-release-15-80.1.i586.rpm + locked: false + medium_nr: 0 + name: sles-release + on_system_by_user: false + path: "./i586/sles-release-15-80.1.i586.rpm" + source: 0 + status: :available + summary: SUSE Linux Enterprise Server 15 Alpha1 + transact_by: :solver + vendor: SUSE LINUX Products GmbH, Nuernberg, Germany + version: 15-80.1 + version_epoch: + version_release: '80.1' + version_version: '15' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/test/product_reader_test.rb new/yast2-installation-3.3.3/test/product_reader_test.rb --- old/yast2-installation-3.2.46/test/product_reader_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.3.3/test/product_reader_test.rb 2017-07-31 15:08:34.827704126 +0200 @@ -0,0 +1,62 @@ +# ------------------------------------------------------------------------------ +# Copyright (c) 2017 SUSE LLC, All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# ------------------------------------------------------------------------------ + +require "yaml" +require_relative "./test_helper" + +require "installation/product_reader" + +describe Installation::ProductReader do + subject { Installation::ProductReader } + + describe "#available_base_products" do + before do + # TODO: proper mocking of pkg methods + allow(subject).to receive(:installation_package_mapping).and_return("SLES" => "skelcd-SLES") + end + + it "returns empty list if there is no product" do + expect(Yast::Pkg).to receive(:ResolvableProperties).with("", :product, "") + .and_return([]) + expect(subject.available_base_products).to eq([]) + end + + it "returns Installation::Product objects" do + products = YAML.load(load_fixture("products", "sles15.yml")) + expect(Yast::Pkg).to receive(:ResolvableProperties).with("", :product, "") + .and_return(products) + expect(subject.available_base_products.first).to be_a(Installation::Product) + end + + it "returns the correct product properties" do + products = YAML.load(load_fixture("products", "sles15.yml")) + expect(Yast::Pkg).to receive(:ResolvableProperties).with("", :product, "") + .and_return(products) + ret = subject.available_base_products.first + expect(ret.name).to eq("SLES") + expect(ret.label).to eq("SUSE Linux Enterprise Server 15 Alpha1") + end + + it "returns only the products from the initial repository" do + sp3 = YAML.load(load_fixture("products", "sles15.yml")).first + addon1 = sp3.dup + addon1["source"] = 1 + addon2 = sp3.dup + addon2["source"] = 2 + + expect(Yast::Pkg).to receive(:ResolvableProperties).with("", :product, "") + .and_return([addon2, addon1, sp3]) + + expect(subject.available_base_products.size).to eq(1) + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/test/product_sorter_test.rb new/yast2-installation-3.3.3/test/product_sorter_test.rb --- old/yast2-installation-3.2.46/test/product_sorter_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.3.3/test/product_sorter_test.rb 2017-07-31 15:08:34.827704126 +0200 @@ -0,0 +1,51 @@ +# ------------------------------------------------------------------------------ +# Copyright (c) 2017 SUSE LLC, All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# ------------------------------------------------------------------------------ + +require_relative "./test_helper" + +require "installation/product" +require "installation/product_sorter" + +describe "Installation::PRODUCT_SORTER" do + + # testing products with defined ordering + let(:p1) { Installation::Product.new("p10", "Product with order 10", order: 10) } + let(:p2) { Installation::Product.new("p20", "Product with order 20", order: 20) } + let(:p3) { Installation::Product.new("p30", "Product with order 30", order: 30) } + # testing products with undefined (nil) ordering + let(:pnil1) { Installation::Product.new("p1", "Product 1 without order") } + let(:pnil2) { Installation::Product.new("p2", "Product 2 without order") } + + it "keeps an already sorted list unchanged" do + products = [p1, p2, p3] + products.sort!(&::Installation::PRODUCT_SORTER) + expect(products).to eq([p1, p2, p3]) + end + + it "sorts the products by the ordering number" do + products = [p3, p2, p1] + products.sort!(&::Installation::PRODUCT_SORTER) + expect(products).to eq([p1, p2, p3]) + end + + it "sorts by label if ordering is missing" do + products = [pnil2, pnil1] + products.sort!(&::Installation::PRODUCT_SORTER) + expect(products).to eq([pnil1, pnil2]) + end + + it "puts the products with undefined order at the end" do + products = [pnil2, p3, pnil1, p1] + products.sort!(&::Installation::PRODUCT_SORTER) + expect(products).to eq([p1, p3, pnil1, pnil2]) + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.46/test/widgets/product_selector_test.rb new/yast2-installation-3.3.3/test/widgets/product_selector_test.rb --- old/yast2-installation-3.2.46/test/widgets/product_selector_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.3.3/test/widgets/product_selector_test.rb 2017-07-31 15:08:34.987704126 +0200 @@ -0,0 +1,39 @@ +require_relative "../test_helper" + +require "cwm/rspec" + +require "installation/product" +require "installation/widgets/product_selector" + +describe ::Installation::Widgets::ProductSelector do + let(:product1) { Installation::Product.new("test1", "Test 1") } + let(:product2) { Installation::Product.new("test2", "Test 2") } + subject { described_class.new([product1, product2]) } + + include_examples "CWM::RadioButtons" + + describe "#store" do + before do + allow(Yast::Pkg).to receive(:PkgApplReset) + allow(Yast::Pkg).to receive(:PkgReset) + end + + it "resets previous package configuration" do + # mock selecting the first product + allow(subject).to receive(:value).and_return("test1") + allow(product1).to receive(:select) + expect(Yast::Pkg).to receive(:PkgApplReset) + expect(Yast::Pkg).to receive(:PkgReset) + subject.store + end + + it "selects the product to install" do + # mock selecting the first product + allow(subject).to receive(:value).and_return("test1") + + expect(product1).to receive(:select) + expect(product2).to_not receive(:select) + subject.store + end + end +end

1 0

commit yast2 for openSUSE:Factory
by root＠hilbert.suse.de 02 Aug '17

02 Aug '17

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2017-08-02 11:26:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2" Wed Aug 2 11:26:51 2017 rev:409 rq:513150 version:3.3.6 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2017-07-22 02:32:04.474650749 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2017-08-02 11:26:53.544999628 +0200 @@ -1,0 +2,15 @@ +Mon Jul 31 08:23:57 UTC 2017 - jreidinger(a)suse.com + +- WorkflowManager: allow to extend workflow from rpm package + (needed for FATE#323450) +- WorkflowManager: drop never used support to extend workflow from + pattern +- 3.3.6 + +------------------------------------------------------------------- +Thu Jul 27 12:28:09 UTC 2017 - jreidinger(a)suse.com + +- drop reading /content file (FATE#322386) +- 3.3.5 + +------------------------------------------------------------------- Old: ---- yast2-3.3.4.tar.bz2 New: ---- yast2-3.3.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.73ckxv/_old 2017-08-02 11:26:54.072924990 +0200 +++ /var/tmp/diff_new_pack.73ckxv/_new 2017-08-02 11:26:54.072924990 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.3.4 +Version: 3.3.6 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0 ++++++ yast2-3.3.4.tar.bz2 -> yast2-3.3.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.3.4/library/control/src/modules/WorkflowManager.rb new/yast2-3.3.6/library/control/src/modules/WorkflowManager.rb --- old/yast2-3.3.4/library/control/src/modules/WorkflowManager.rb 2017-07-21 16:47:07.656722812 +0200 +++ new/yast2-3.3.6/library/control/src/modules/WorkflowManager.rb 2017-07-31 11:06:26.160824981 +0200 @@ -398,28 +398,40 @@ # Download and extract the control file (installation.xml) from the add-on # repository. # - # @param src_id [Fixnum] repository ID + # @param source [String, Fixnum] source where to get control file. It can be fixnum for + # addon type or package name for package type # @return [String, nil] path to downloaded installation.xml file or nil # or nil when no workflow is defined or the workflow package is missing - def addon_control_file(src_id) - product = find_product(src_id) - return nil unless product && product["product_package"] - - # the dependencies are bound to the product's -release package - release_package = Pkg.ResolvableDependencies(product["product_package"], :package, "").first - - # find the package name with installer update in its Provide dependencies - control_file_package = find_control_package(release_package) - return nil unless control_file_package + def control_file(source) + package = case source + when ::Integer + product = find_product(source) + return nil unless product && product["product_package"] + + product_package = product["product_package"] + + # the dependencies are bound to the product's -release package + release_package = Pkg.ResolvableDependencies(product_package, :package, "").first + + # find the package name with installer update in its Provide dependencies + control_file_package = find_control_package(release_package) + return nil unless control_file_package + + control_file_package + when ::String + source + else + raise ArgumentError, "Invalid argument source #{source.inspect}" + end # get the repository ID of the package - src = package_repository(control_file_package) + src = package_repository(package) return nil unless src - # ensure the previous content is removed, the src_id should avoid + # ensure the previous content is removed, the src should avoid # collisions but rather be safe... - dir = addon_control_dir(src_id, cleanup: true) - fetch_package(src, control_file_package, dir) + dir = addon_control_dir(src, cleanup: true) + fetch_package(src, package, dir) path = File.join(dir, "installation.xml") return nil unless File.exist?(path) @@ -452,21 +464,28 @@ # Returns requested control filename. Parameter 'name' is ignored # for Add-Ons. # - # @param [Symbol] type `addon or `pattern + # @param [Symbol] type :addon or :package # @param [Fixnum] src_id with Source ID - # @param [String] name with unique identification - # @return [String] path to already cached workflow file, control file is downloaded if not yet chached - def GetCachedWorkflowFilename(type, src_id, _name) - if type == :addon - disk_filename = GenerateAdditionalControlFilePath(src_id, "") - - # A cached copy exists - if FileUtils.Exists(disk_filename) - Builtins.y2milestone("Using cached file %1", disk_filename) - return disk_filename - # Trying to get the file from source - else - Builtins.y2milestone("File %1 not cached", disk_filename) + # @param [String] name with unique identification, ignored for addon + # @return [String] path to already cached workflow file, control file is downloaded if not yet cached + # or nil if failed to get filename + def GetCachedWorkflowFilename(type, src_id, name = "") + if ![:package, :addon].include?(type) + Builtins.y2error("Unknown workflow type: %1", type) + return nil + end + + disk_filename = GenerateAdditionalControlFilePath(src_id, name) + + # A cached copy exists + if FileUtils.Exists(disk_filename) + Builtins.y2milestone("Using cached file %1", disk_filename) + return disk_filename + # Trying to get the file from source + else + Builtins.y2milestone("File %1 not cached", disk_filename) + case type + when :addon # using a file from source, works only for SUSE tags repositories use_filename = Pkg.SourceProvideDigestedFile( src_id, @@ -477,25 +496,22 @@ # The most generic way it to use the package referenced by the "installerextension()" # provides, this works with all repository types, including the RPM-MD repositories. - use_filename ||= addon_control_file(src_id) - - # File exists? - return use_filename.nil? ? nil : StoreWorkflowFile(use_filename, disk_filename) + use_filename ||= control_file(src_id) + when :package + use_filename = control_file(name) end - # New workflow types can be added here - else - Builtins.y2error("Unknown workflow type: %1", type) - return nil + # File exists? + return use_filename.nil? ? nil : StoreWorkflowFile(use_filename, disk_filename) end end # Stores new workflow (if such workflow exists) into the Worflow Store. # - # @param [Symbol] type `addon or `pattern + # @param [Symbol] type :addon or :package # @param intger src_id with source ID # @param [String] name with unique identification name of the object - # ("" for `addon, pattern name for `pattern) + # ("" for `addon, package name for :package) # @return [Boolean] whether successful (true also in case of no workflow file) # # @example @@ -507,20 +523,14 @@ src_id, name ) - if !Builtins.contains([:addon, :pattern], type) + if !Builtins.contains([:addon, :package], type) Builtins.y2error("Unknown workflow type: %1", type) return false end + name = "" if type == :addon # new xml filename - used_filename = nil - - if type == :addon - used_filename = GetCachedWorkflowFilename(:addon, src_id, "") - elsif type == :pattern - Builtins.y2error("Not implemented yet") - return false - end + used_filename = GetCachedWorkflowFilename(type, src_id, name) if !used_filename.nil? && used_filename != "" @unmerged_changes = true @@ -535,14 +545,15 @@ # Removes workflow (if such workflow exists) from the Worflow Store. # Alose removes the cached file but in the installation. # - # @param [Symbol] type `addon or `pattern - # @param intger src_id with source ID - # @param [String] name with unique identification name of the object + # @param [Symbol] type :addon or :package + # @param [Integer] src_id with source ID + # @param [String] name with unique identification name of the object. + # For :addon it should be empty string # # @return [Boolean] whether successful (true also in case of no workflow file) # # @example - # RemoveWorkflow (`addon, 4, ""); + # RemoveWorkflow (:addon, 4, ""); def RemoveWorkflow(type, src_id, name) Builtins.y2milestone( "Removing Workflow: Type %1, ID %2, Name %3", @@ -550,20 +561,14 @@ src_id, name ) - if !Builtins.contains([:addon, :pattern], type) + if !Builtins.contains([:addon, :package], type) Builtins.y2error("Unknown workflow type: %1", type) return false end + name = "" if type == :addon # cached xml file - used_filename = nil - - if type == :addon - used_filename = GenerateAdditionalControlFilePath(src_id, "") - else - Builtins.y2error("Not implemented yet") - return false - end + used_filename = GenerateAdditionalControlFilePath(src_id, name) if !used_filename.nil? && used_filename != "" @unmerged_changes = true @@ -842,6 +847,8 @@ base = deep_copy(base) addon = deep_copy(addon) + log.info "merging workflow #{addon.inspect} to #{base.inspect}" + # Merging - removing steps, settings removes = Ops.get_list(addon, "remove_modules", []) @@ -895,6 +902,7 @@ end end + log.info "result of merge #{base.inspect}" deep_copy(base) end @@ -913,6 +921,8 @@ found = false new_workflows = [] arch_all_wf = {} + log.info "workflow to update #{workflow.inspect}" + Builtins.foreach(ProductControl.workflows) do |w| if Ops.get_string(w, "stage", "") != stage || Ops.get_string(w, "mode", "") != mode @@ -949,6 +959,9 @@ new_workflows = Builtins.add(new_workflows, workflow) end + + log.info "new workflow after update #{new_workflows}" + ProductControl.workflows = deep_copy(new_workflows) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.3.4/library/control/test/workflow_manager_test.rb new/yast2-3.3.6/library/control/test/workflow_manager_test.rb --- old/yast2-3.3.4/library/control/test/workflow_manager_test.rb 2017-07-21 16:47:07.684722812 +0200 +++ new/yast2-3.3.6/library/control/test/workflow_manager_test.rb 2017-07-31 11:06:26.160824981 +0200 @@ -267,7 +267,7 @@ end end - describe "#addon_control_file" do + describe "#control_file" do # setup fake products and their packages let(:repo_id) { 42 } let(:product_package) { "foo-release" } @@ -290,43 +290,45 @@ allow(File).to receive(:exist?).and_call_original end - it "returns nil if the repository does not provide any product" do - expect(Yast::Pkg).to receive(:ResolvableDependencies).with("", :product, "").and_return([]) - expect(subject.addon_control_file(repo_id)).to be nil - end + context "when repository id is passed" do + it "returns nil if the repository does not provide any product" do + expect(Yast::Pkg).to receive(:ResolvableDependencies).with("", :product, "").and_return([]) + expect(subject.control_file(repo_id)).to be nil + end - it "returns nil if the product does not refer to a release package" do - product = { "name" => "foo", "source" => repo_id } - expect(Yast::Pkg).to receive(:ResolvableDependencies).with("", :product, "").and_return([product]) - expect(subject.addon_control_file(repo_id)).to be nil - end + it "returns nil if the product does not refer to a release package" do + product = { "name" => "foo", "source" => repo_id } + expect(Yast::Pkg).to receive(:ResolvableDependencies).with("", :product, "").and_return([product]) + expect(subject.control_file(repo_id)).to be nil + end - it "returns nil if the product belongs to a different repository" do - product = { "name" => "foo", "source" => repo_id + 1 } - expect(Yast::Pkg).to receive(:ResolvableDependencies).with("", :product, "").and_return([product]) - expect(subject.addon_control_file(repo_id)).to be nil - end + it "returns nil if the product belongs to a different repository" do + product = { "name" => "foo", "source" => repo_id + 1 } + expect(Yast::Pkg).to receive(:ResolvableDependencies).with("", :product, "").and_return([product]) + expect(subject.control_file(repo_id)).to be nil + end - it "returns nil if the release package cannot be found" do - expect(Yast::Pkg).to receive(:ResolvableDependencies).with(product_package, :package, "").and_return([]) - expect(subject.addon_control_file(repo_id)).to be nil - end + it "returns nil if the release package cannot be found" do + expect(Yast::Pkg).to receive(:ResolvableDependencies).with(product_package, :package, "").and_return([]) + expect(subject.control_file(repo_id)).to be nil + end - it "returns nil if the release package does not have any dependencies" do - release = { "name" => "foo", "source" => repo_id } - expect(Yast::Pkg).to receive(:ResolvableDependencies).with(product_package, :package, "").and_return([release]) - expect(subject.addon_control_file(repo_id)).to be nil - end + it "returns nil if the release package does not have any dependencies" do + release = { "name" => "foo", "source" => repo_id } + expect(Yast::Pkg).to receive(:ResolvableDependencies).with(product_package, :package, "").and_return([release]) + expect(subject.control_file(repo_id)).to be nil + end - it "returns nil if the release package does not have any installerextension() provides" do - release = { "name" => "foo", "source" => repo_id, "deps" => ["provides" => "foo"] } - expect(Yast::Pkg).to receive(:ResolvableDependencies).with(product_package, :package, "").and_return([release]) - expect(subject.addon_control_file(repo_id)).to be nil + it "returns nil if the release package does not have any installerextension() provides" do + release = { "name" => "foo", "source" => repo_id, "deps" => ["provides" => "foo"] } + expect(Yast::Pkg).to receive(:ResolvableDependencies).with(product_package, :package, "").and_return([release]) + expect(subject.control_file(repo_id)).to be nil + end end it "returns nil if the installer extension package is not found" do expect(Yast::Pkg).to receive(:ResolvableProperties).with(ext_package, :package, "").and_return([]) - expect(subject.addon_control_file(repo_id)).to be nil + expect(subject.control_file(repo_id)).to be nil end context "downloading the installer extension package fails" do @@ -337,11 +339,11 @@ it "reports an error" do expect(Yast::Report).to receive(:Error) - subject.addon_control_file(repo_id) + subject.control_file(repo_id) end it "returns nil" do - expect(subject.addon_control_file(repo_id)).to be nil + expect(subject.control_file(repo_id)).to be nil end end @@ -353,11 +355,11 @@ it "reports an error" do expect(Yast::Report).to receive(:Error) - subject.addon_control_file(repo_id) + subject.control_file(repo_id) end it "returns nil" do - expect(subject.addon_control_file(repo_id)).to be nil + expect(subject.control_file(repo_id)).to be nil end end @@ -366,18 +368,18 @@ expect(Packages::PackageExtractor).to receive(:new).with(instance_of(String)).and_call_original expect_any_instance_of(Packages::PackageExtractor).to receive(:extract).with(instance_of(String)) allow(File).to receive(:exist?) - subject.addon_control_file(repo_id) + subject.control_file(repo_id) end it "returns nil if the extracted package does not contain installation.xml" do expect(File).to receive(:exist?).with(/installation\.xml\z/).and_return(false) - expect(subject.addon_control_file(repo_id)).to be nil + expect(subject.control_file(repo_id)).to be nil end it "returns the installation.xml path if the extracted package contains it" do expect(File).to receive(:exist?).with(/installation.xml\z/).and_return(true) # the returned path contains "/installation.xml" at the end - expect(subject.addon_control_file(repo_id)).to end_with("/installation.xml") + expect(subject.control_file(repo_id)).to end_with("/installation.xml") end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.3.4/library/general/src/Makefile.am new/yast2-3.3.6/library/general/src/Makefile.am --- old/yast2-3.3.4/library/general/src/Makefile.am 2017-07-21 16:47:07.788722812 +0200 +++ new/yast2-3.3.6/library/general/src/Makefile.am 2017-07-31 11:06:26.184824981 +0200 @@ -35,7 +35,6 @@ modules/Hooks.rb scrconf_DATA = \ - scrconf/content.scr \ scrconf/cfg_hotplug.scr \ scrconf/proc_meminfo.scr \ scrconf/etc_sysctl_conf.scr \ @@ -46,7 +45,6 @@ scrconf/cfg_features.scr \ scrconf/etc_ssh_sshd_config.scr \ scrconf/cfg_displaymanager.scr \ - scrconf/contentfile.scr \ scrconf/cfg_yast2.scr \ scrconf/cfg_xversion.scr \ scrconf/yast2_groups.scr \ @@ -70,8 +68,7 @@ agent_SCRIPTS = \ servers_non_y2/ag_netd \ servers_non_y2/ag_anyxml \ - servers_non_y2/ag_freespace \ - servers_non_y2/ag_content + servers_non_y2/ag_freespace ydata_DATA = \ data/country.ycp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.3.4/library/general/src/scrconf/content.scr new/yast2-3.3.6/library/general/src/scrconf/content.scr --- old/yast2-3.3.4/library/general/src/scrconf/content.scr 2017-07-21 16:47:07.872722812 +0200 +++ new/yast2-3.3.6/library/general/src/scrconf/content.scr 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -/** - * File: content.scr - * Summary: Agent for reading/writing /content - * Access: read only - * Author: Klaus Kaempf <kkaempf(a)suse.de> - * - * Example: - * Dir(.content) - * (["PRODUCT", "VERSION", ...]) - ** - * Read(.content.PRODUCT) - * ("8.1") - * - * $Id$ - */ -.content - -`ag_ini( - `IniAgent( "/content", - $[ - "options" : [ "read_only", "global_values", "flat" ], - "comments" : [ "^#.*", "^[ \t]*$", ], - "params" : [ - // Bugzilla #305495 comments #8 and #9 - $[ "match" : [ "^[ \t]*([^ \t]+)[ \t]*(.*)[ \t]*$", "%s %s" ] ] - ] - ] - ) -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.3.4/library/general/src/scrconf/contentfile.scr new/yast2-3.3.6/library/general/src/scrconf/contentfile.scr --- old/yast2-3.3.4/library/general/src/scrconf/contentfile.scr 2017-07-21 16:47:07.872722812 +0200 +++ new/yast2-3.3.6/library/general/src/scrconf/contentfile.scr 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -/** - * File: - * contentfile.scr - * Summary: - * SCR Agent for parsing content file - * Access: - * read - * Authors: - * Unknown <yast2-hacker(a)suse.de> - * See: - * libscr - * Example: - * map contentmap = (map)SCR::Read(.content_file, path_to_content_file); - * - * $Id$ - * - */ -.content_file - -`ag_content () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.3.4/library/general/src/servers_non_y2/ag_content new/yast2-3.3.6/library/general/src/servers_non_y2/ag_content --- old/yast2-3.3.4/library/general/src/servers_non_y2/ag_content 2017-07-21 16:47:07.876722812 +0200 +++ new/yast2-3.3.6/library/general/src/servers_non_y2/ag_content 1970-01-01 01:00:00.000000000 +0100 @@ -1,55 +0,0 @@ -#!/usr/bin/perl - -use strict; - -package ag_content; -use ycp; -use YaST::SCRAgent; -use diagnostics; - -use Getopt::Long; -use POSIX qw(tmpnam); -use IO::File; - -our @ISA = ("YaST::SCRAgent"); - -y2milestone ("ag_content started"); - -# read the agent arguments -#$_ = <STDIN>; -# no input at all - simply exit -#exit if ! defined $_; - - -sub Read () -{ - my $class = shift; - my ($path, $content_file) = @_; - - my %content; - my $fh; - if (defined($content_file)) { - $fh = IO::File->new("< $content_file") - or return %content; - - while(<$fh>) - { - m/^(\S*)\s(.*)/; - $content{$1} = $2; - } - close $fh; - } - - return( \%content ); -} - - - - -package main; - -ag_content->Run (); - - - -#EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.3.4/library/packages/test/data/content_files/SLES_12_Beta4 new/yast2-3.3.6/library/packages/test/data/content_files/SLES_12_Beta4 --- old/yast2-3.3.4/library/packages/test/data/content_files/SLES_12_Beta4 2017-07-21 16:47:08.184722812 +0200 +++ new/yast2-3.3.6/library/packages/test/data/content_files/SLES_12_Beta4 1970-01-01 01:00:00.000000000 +0100 @@ -1,118 +0,0 @@ -CONTENTSTYLE 11 -DATADIR suse -DESCRDIR suse/setup/descr -DISTRIBUTION SUSE_SLE -LINGUAS cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW -REGISTERPRODUCT true -REPOID obsproduct://build.suse.de/SUSE:SLE-12:GA/SLES/12/DVD/x86_64 -SUMMARY SUSE Linux Enterprise Server 12 -VENDOR SUSE -RELEASE -LABEL SUSE Linux Enterprise Server 12 -META SHA256 defaa064a4dcc99292515dc8cd43de0d83d2c0414a832946926b17c527fe6973 app-icons.tar.gz -META SHA256 6781ee1b3a39dd0792677569c2407ff03a22bf4534215961946e7526df3d6c57 appdata.xml.gz -META SHA256 4800c7f468934e7fe7f76937d7458eb29d32b11626cc1f4e7d7c1818f26123f6 packages.DU.gz -META SHA256 b5a4994300b5546496d8deeb37e52ed99c2253e39dd6d21703f0cbbd56ecb93a packages.FL.gz -META SHA256 99dd0d213c2355c72a18c7d9c60677c548d1ed3d8d00d94b1594a5e115757849 packages.cs.gz -META SHA256 43b9841b85288b8bedff21f86fe9a67ea8cd4b24031b776c823535b0b6406f00 packages.de.gz -META SHA256 f678d98a9ee8f74634873f393e3e1414108ea8c93fb2c2c8ff5401705329105d packages.en.gz -META SHA256 9e066f92ccce24182024d0fa30267a229fc4148d393615ee8270f28a4ed4b14f packages.es.gz -META SHA256 381d05170924a56967ce0e6879b0ce267bd0ab68cda78d06fc505277c12bcfa3 packages.fi.gz -META SHA256 b75e7ddea2dd3c94e20e62a94de1623b5ed1489bcd2e1799fb4d4e81148df74e packages.fr.gz -META SHA256 0337d2c778829e043909ae51326d9f7ac2834f395841af6b1385ee859f072aea packages.gz -META SHA256 d2ff7cbfc515d62888aac86f0b2ea91b582469f73fd3218c939b7b37dfc40b8f packages.hu.gz -META SHA256 35c2fe0568f29affb94369b1ad1104f1cbeb3b5efe25f3179fd71ef48ce3aec2 packages.it.gz -META SHA256 3142ba99ee37d72c432eaa647dece0f62c9ffcc33d5eb8c9291ffa4d08e67bef packages.ja.gz -META SHA256 9b0292bb5cdddf19a98515e8f8ae94fab16b4f1b07c82157c5b0b7732344e561 packages.nl.gz -META SHA256 2a5b77f7531a4955ecfa8e055e0c65d7255dba81ecb10b21a3e7aa2be04a244b packages.pl.gz -META SHA256 3932a18268e9b690fddd4dfb3a1c6bcd43ac4437f26537145f6661a1fe5018b4 packages.pt.gz -META SHA256 3de3e156abd356bc11d4a58980fa69b5d232e029f53f8fda89e3f9e6e1b2672b packages.pt_BR.gz -META SHA256 7fa8bf8677b41e1e68638dd6624901e53d44552e0333ffd0d1717d9a04c5a6ab packages.ru.gz -META SHA256 567b2db65922b1cbbeba349a784b1d0b1ee41d113a02c29d62888c26194a55f1 packages.zh_CN.gz -META SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 patterns -HASH SHA256 3c56471910cc033424cbe91c2e9f6acb7bd65497bfba52e84cd443448d5df017 license.tar.gz -HASH SHA256 0ccdbae83696e3e777cd18e38142f18adc40aa668a22d1c14cbe80c925cab423 control.xml -HASH SHA256 385c1941409e50e42f8ebc2e1dd5c681355071a49048a13e2936bc8059016967 media.1/info.txt -HASH SHA256 d704d29e35bf9dfe9b7192c0a60e3017ef83b9cc9adef04ce2d8cf4b15024d34 boot/x86_64/arphic-uming-fonts.rpm -HASH SHA256 44877029ea26dd501fdc54c4786d6021b73122c038325c48091493a3ee139eb3 boot/x86_64/bind -HASH SHA256 a02f3db014bd291d1e71f39dd9ead6957fdab011a1555fc0f3c51021f511b199 boot/x86_64/common -HASH SHA256 6a44667b01d126a52e5c2cc1cabc898903ec8e41cabea0d870b72af07c1dff23 boot/x86_64/config -HASH SHA256 7a3bde5d20ef246033698ea7ecf2f41f462b592056bae20526efb37df665b7c1 boot/x86_64/cracklib-dict-full.rpm -HASH SHA256 1bb0c7956a68060e065555fda0c7d2d46956b41bf2b35cd41c8c3ea4beea7479 boot/x86_64/efi -HASH SHA256 c518c3b156d6d5312c5045cbe17c5b087b688e693ccbf39853ad08f4a05adcc7 boot/x86_64/gdb -HASH SHA256 f54b88bc0d4b82e98c6dba9aba8cb33c2e786833d8e40f6135b86e98842931b8 boot/x86_64/indic-fonts.rpm -HASH SHA256 fdd6bb0b661206fdc62e62ca363de8c55a093fb4c02f4f030510dc9c0d54a41e boot/x86_64/initrd-xen -HASH SHA256 9e6d01d851ac02a73f55afca5e75d8d31bb37b03afdfdc2af638b9242f51e441 boot/x86_64/ipa-gothic-fonts.rpm -HASH SHA256 88f8d7cd58b04c8b71f1e9c7a6b9217790283632605b87441ea2b0ab7c565a64 boot/x86_64/khmeros-fonts.rpm -HASH SHA256 87ad5a0902680768789c20c6278994e66c0c9951970363a5da4efc3b1342a004 boot/x86_64/mkbootdisk -HASH SHA256 7b49c3cde57e14942bbf21c715a5a32eac4bcf3e9c5b5a1478b9f5bd9e3e7572 boot/x86_64/rescue -HASH SHA256 9d1a89da63b5711370d15cf37a9c610f0c7595e5be25ea9e67878db0f164ba3f boot/x86_64/root -HASH SHA256 24d328ef64d5921afcc3488cbfcf9b7b7ae5a306f316e5a0d28f52b95c4ec75e boot/x86_64/rpmlist -HASH SHA256 c16f67ed3a176f3424071f690fef2be1b2b59838de977e0b2a2fa311dfc0df4e boot/x86_64/thai-fonts.rpm -HASH SHA256 52ce608c9620e8ef604a0a3b28457d3f99b0ddd25d06525ed6b0fe7d95b8415d boot/x86_64/un-fonts.rpm -HASH SHA256 12474c4267960ba11174191c73c1a579a402f21101e62849135db91f32b42447 boot/x86_64/vmlinuz-xen -HASH SHA256 1cb21283dea60553a217b237f6d3debdf20496e3a92eb65272d6e2c4573dc7ff boot/x86_64/yast2-trans-af.rpm -HASH SHA256 47f4ad637d8b686ddeb95e6aefa4b81a1360840bd13bbddb1b7bd78509985d58 boot/x86_64/yast2-trans-ar.rpm -HASH SHA256 8a566add84b7fa1a55ddeecb0a2c0cfb4b245e7ad6e8ffe64c4a7931383e2fcc boot/x86_64/yast2-trans-bg.rpm -HASH SHA256 4341ca008433f1c9a0755ad438404d677df0c5b68bfbb8386e49cb9573b74380 boot/x86_64/yast2-trans-bn.rpm -HASH SHA256 e30d7554cee72c46121b104cee1e31e3cc6e17e7589accfbe9a33d81c04ee255 boot/x86_64/yast2-trans-bs.rpm -HASH SHA256 f194e0cbb66f82623cfadb6acc0f0c22bb5d4aa5742b400e19d4eda443175d2c boot/x86_64/yast2-trans-ca.rpm -HASH SHA256 e5b9af807dabfad9b19dbc6c4aaa8fe3138ef4dbd81a0b2ae8aa2be14e1efd5a boot/x86_64/yast2-trans-cs.rpm -HASH SHA256 9b16be3aefd02c43a1b7f700cdb4cdd4bcb67edf74e0940d9e79c57bcdaaebff boot/x86_64/yast2-trans-cy.rpm -HASH SHA256 30bb79027b12a618edff8b60b0b2691c983a2341c9fcfe960d3bc802168bad1e boot/x86_64/yast2-trans-da.rpm -HASH SHA256 613ee3d36a2d01c0ed6a8fe49358e2c0e87fd69ee69b0a3b4259b85b1c26bdb0 boot/x86_64/yast2-trans-de.rpm -HASH SHA256 1d18e28f608505263450c38dae4be4a5d18c333c42e26faf588e3ed23c711eca boot/x86_64/yast2-trans-el.rpm -HASH SHA256 8b82fec5801d35d6dae6d234d6ef1b5decdb059bcde3cb6c80f1f8b38df74f56 boot/x86_64/yast2-trans-en_GB.rpm -HASH SHA256 18eedd9a39b7f146b5b3f0c2e44b45aaa3870d4cf93efafaef24cd610b264acc boot/x86_64/yast2-trans-en_US.rpm -HASH SHA256 8a172d59bd84667da62b8271e4363336ed411be2fb0212a98c9610c7e4c4fee6 boot/x86_64/yast2-trans-es.rpm -HASH SHA256 f147c8518766d5f00c451461363f7f539b3ed65e3ff37653095320bec243326d boot/x86_64/yast2-trans-et.rpm -HASH SHA256 6f9a2c5437c1582e7a56f5d852ee3bf1b021551e200e305a42a534a254c05330 boot/x86_64/yast2-trans-fa.rpm -HASH SHA256 559349ba3b1543e57d9e796c9e7aca2aa6eb7b6c216e8acb0c5844b1700a9cda boot/x86_64/yast2-trans-fi.rpm -HASH SHA256 0e0ddf17f87051dc38163c52f38a9fd098160101f07df8f6f87f7bb57a74cdfa boot/x86_64/yast2-trans-fr.rpm -HASH SHA256 70a2ab180bfb67b98c7d65034bfa83bfbe9c6680dd49f5f01e1e6d2e59640e7c boot/x86_64/yast2-trans-gl.rpm -HASH SHA256 d88087c242fefdc7124a0f0735aabb25dbe5638be91d1d22116ebb2f50c83eb3 boot/x86_64/yast2-trans-gu.rpm -HASH SHA256 0ee9e8fef8e476fdde815418f92899889e70e80014b2afc34820709c6c0a19e7 boot/x86_64/yast2-trans-hi.rpm -HASH SHA256 b4789a9c58d97d631c765877a7e3df2592696dc532437d7f055edc098257bdeb boot/x86_64/yast2-trans-hr.rpm -HASH SHA256 d6efca6ce0d2b21b22ef98645a023b6f07674e825de8900cb49019afad4bb2bb boot/x86_64/yast2-trans-hu.rpm -HASH SHA256 c9a68c6c095c80d058355b9237699c9a05943f8f45b1045e70f2cf860e4f6fd7 boot/x86_64/yast2-trans-id.rpm -HASH SHA256 4d97c393a0584fa4122b57462e7143c172739773976139db8b477185b3e499e0 boot/x86_64/yast2-trans-it.rpm -HASH SHA256 ec329ab1a64b6434e6ee4b88863fa0c359009c26f4052d6d1e25d1bac5d52908 boot/x86_64/yast2-trans-ja.rpm -HASH SHA256 90eb1507c642d2130913188373073e947103d9abf455f0c9e2472c91bcb12469 boot/x86_64/yast2-trans-jv.rpm -HASH SHA256 613e7263ae0d3924a90e50a95379f95a6fabee6139dc78bde1fb233c59cc34bc boot/x86_64/yast2-trans-ka.rpm -HASH SHA256 f25dde54f46b0fe499791fa18abcaeee43164266d318b0add23989f8a101ee9a boot/x86_64/yast2-trans-km.rpm -HASH SHA256 41b3a1b3b529862a02697744cce2bb7771db073c8d2e3147b42aa69dff02d00d boot/x86_64/yast2-trans-ko.rpm -HASH SHA256 dc468af3cd6c8132cffa524cc2edcb504c4b6f98e1c69c83136dcb0ab8b9538c boot/x86_64/yast2-trans-lo.rpm -HASH SHA256 ec8bb3035e1170008d1d3528e74d1d52114345c6e9e0cbd71bd04c6d2299a1a9 boot/x86_64/yast2-trans-lt.rpm -HASH SHA256 ff6d280568dbcd4a81b5087a6293ff79e3c4794fc088f0dd15d96d3524b84587 boot/x86_64/yast2-trans-mk.rpm -HASH SHA256 24b8e38e959c66ca9472bbc0ea0e9e084346b98769c0b747562ef7fc8b150d6c boot/x86_64/yast2-trans-mr.rpm -HASH SHA256 8061b5369b6690aebc138e0e6ed9dd6d10d1d82daee1ca84af775d74076ecb2f boot/x86_64/yast2-trans-nb.rpm -HASH SHA256 203864a002efec7ec805f37a37c344212372d27f2441b258b2f455af936a55cd boot/x86_64/yast2-trans-nl.rpm -HASH SHA256 627b57df80aa97b0e6e4f0fadc9a395d8e7651330c6a5754b995b26f2c1bf875 boot/x86_64/yast2-trans-pa.rpm -HASH SHA256 c5875eef6affad4c153e7cfc41b3379657c0883a283995ac5e90c27621fa8794 boot/x86_64/yast2-trans-pl.rpm -HASH SHA256 985efa6ce1d1d6841549442aed29597b157c98a6794b532e4af873dc75b44da6 boot/x86_64/yast2-trans-pt.rpm -HASH SHA256 b48e88beb2282136944fc7f98fcfe05af1c6c9024b74079562bd34512d72cc9a boot/x86_64/yast2-trans-pt_BR.rpm -HASH SHA256 b6960f2808b7b3fe3eb6f40af3ac8de26ad870cbf6cc6ab46c305508765f0c4a boot/x86_64/yast2-trans-ro.rpm -HASH SHA256 3ebdca69566f0a5521506d189ac9eec1472eb5cd89bb4061b2c8a5a2b88103d2 boot/x86_64/yast2-trans-ru.rpm -HASH SHA256 7da30fe592ecc3c2463e78c170ec711810c606568fdad92f7386dddbc6cab802 boot/x86_64/yast2-trans-si.rpm -HASH SHA256 32407c1f48949c52b27a4075d3e55e6f33f581dc18eb16d780bdad7a6da85e99 boot/x86_64/yast2-trans-sk.rpm -HASH SHA256 20e0bcb82ac0667c6f13cb8f07e47c9114d3abd01fa1cc87c6256f7be6bee5d4 boot/x86_64/yast2-trans-sl.rpm -HASH SHA256 8a3e3cdad8a13e90bb9946458ba6e76619c8486c37f8096b8379871c09664fc3 boot/x86_64/yast2-trans-sr.rpm -HASH SHA256 3fcc32c883a5b480e9b0a3005da79a6e155d9aa759d91d7f4b6fda502a0a4d8e boot/x86_64/yast2-trans-sv.rpm -HASH SHA256 091b324b2d1d1e269fcb879aadaa8cb7d3a827907acaf93edf10b7a297db37fd boot/x86_64/yast2-trans-ta.rpm -HASH SHA256 bffa6821ce64588ade44f7ee86ab810e8b3717ab0043e78f5380a99312f0adc2 boot/x86_64/yast2-trans-th.rpm -HASH SHA256 501736601af1d692a719300c6c36e05f651368ecb91f183ab86c93c2000fb9d9 boot/x86_64/yast2-trans-tr.rpm -HASH SHA256 92cce4b41c4a96c2dc92a6e82582d1d487f8d6527b898112202e57e38a3012bb boot/x86_64/yast2-trans-uk.rpm -HASH SHA256 2b776b3a192bbed3a5b3efd2da496014057f66972b0a2e6e1c76a078634180bf boot/x86_64/yast2-trans-vi.rpm -HASH SHA256 8614a55f2828636b3d48cf72d2ef288a83ffcc6a480799eb08f0b686fd3ac56d boot/x86_64/yast2-trans-wa.rpm -HASH SHA256 2d21d37be00e3605d5a9a0bade23d864ae54fa391b813bcc0bef1f0b6f22067b boot/x86_64/yast2-trans-xh.rpm -HASH SHA256 deb02fc45cbb5ae60eff5f8d709e8dfff51a79954e3c79d7818804051a55a0c5 boot/x86_64/yast2-trans-zh_CN.rpm -HASH SHA256 2daf6740945d9bf56eacfb3789e3e73e21b4ab9337ab7da8e13dc1156646a4fc boot/x86_64/yast2-trans-zh_TW.rpm -HASH SHA256 86181848bf024542f7c0dd082ca354167a5f4f5b9623d2e6f574193f1544c9aa boot/x86_64/yast2-trans-zu.rpm -HASH SHA256 3531a4cee4e502e891e296562960a1f154f588a31bacdcb5713c4fa840764a2c boot/x86_64/loader/linux -HASH SHA256 3ca4f3f52b22d2cadfedfcc4552cfbface51562f767b9daa5f07cec6af669a3e boot/x86_64/loader/initrd -HASH SHA256 66f2f83a34d832de2e7fc18eca59813d3497ca24c3cd954b5cf98961a479c911 docu/RELEASE-NOTES.en.html -HASH SHA256 4db99b77702457fc0b8bedc4f70c691a3b12b322646a85b2c06fa21477967db1 docu/RELEASE-NOTES.en.pdf -HASH SHA256 66f2f83a34d832de2e7fc18eca59813d3497ca24c3cd954b5cf98961a479c911 docu/RELEASE-NOTES.en.rtf -HASH SHA256 789f911aee49b889a373cb368a6cdeaf69c90803c21439e53f9f89cd5272e0d3 docu/RELEASE-NOTES.en.txt -KEY SHA256 cf04fe3267f44cd2d8de08ba72d70c35584b521c107eb1970b4014a9ba117c2d gpg-pubkey-39db7c82-510a966b.asc -KEY SHA256 c3bef402223b6b35cb857e0775cca8eedbda64e37f052af8d222a35dddc7f4a2 gpg-pubkey-50a3dd1c-50f35137.asc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.3.4/library/packages/test/data/content_files/openSUSE_13.1_GM new/yast2-3.3.6/library/packages/test/data/content_files/openSUSE_13.1_GM --- old/yast2-3.3.4/library/packages/test/data/content_files/openSUSE_13.1_GM 2017-07-21 16:47:08.184722812 +0200 +++ new/yast2-3.3.6/library/packages/test/data/content_files/openSUSE_13.1_GM 1970-01-01 01:00:00.000000000 +0100 @@ -1,134 +0,0 @@ -BASEARCHS x86_64 -CONTENTSTYLE 11 -DATADIR suse -DESCRDIR suse/setup/descr -DISTRIBUTION openSUSE -LABEL openSUSE -LINGUAS cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW -NAME openSUSE -RELNOTESURL http://doc.opensuse.org/release-notes/x86_64/openSUSE/13.1/release-notes-op… -VENDOR openSUSE -VERSION 13.1 -RELEASE 1.10 -META SHA256 22b76833801210a252ed1a00b6c5d4c800c89a24bcd7162592f561d9b8c636b7 app-icons.tar.gz -META SHA256 02bfee819d968a97f7a31a29265ee017ad1fcc465bd46b3ced220616f4f1a070 appdata.xml.gz -META SHA256 e533789cded733ee63c8de8966541c9fb7976f248699cb5b5b0ba9f70df55429 dvd-13.1-13.6.1.x86_64.pat.gz -META SHA256 48e95ebba4f6d332378ca343451defbc053073a0adf3521969fffe74fb080923 packages.DU.gz -META SHA256 c1c000324bbf7cc67d64c5d2403a3836d091ad5e9bbd18bfe932816c90bb837a packages.FL.gz -META SHA256 cb32ba94f11c1f574cdb807643df5356ac40d7a46ab39ed1912dde237cf87413 packages.cs.gz -META SHA256 12a6328a3f1ea13854e17306fafcc7a68d17ca703ef80d467aed27fd30fb8649 packages.de.gz -META SHA256 d8197911e272b452df1441160153c115ad4a559ef60fb4f69a2bd881a724d387 packages.en.gz -META SHA256 b86ef2fe33138f8593326538f8197aefdcab04bb71f3b6fbb1811798720cf730 packages.es.gz -META SHA256 ea74f7a8941362fb0d578865b003c0228c6564c5c95a72edd049c27e011344ad packages.fi.gz -META SHA256 fd7a7b72a0a2b946b78909ea358fb0a9d7a2ff7c719bed6fadfc979892227564 packages.fr.gz -META SHA256 6f451df38a626e6c90c988e5da2e48b4800a61b9f9a201c4f784deab4d3c247a packages.gz -META SHA256 829ec83fa77ba368829bb7801b4e8c4023facebc1194f3f9f4b75d663c58a141 packages.hu.gz -META SHA256 6668f8b284d9e05f096ea9f5ba47da8fa416b493654257f3a435157528c4fd9e packages.it.gz -META SHA256 df2ad0057133e2df56e9bc04df4677f0b5351fbfa25504099e055d512e9f1455 packages.ja.gz -META SHA256 4a276d1585c4c85a98dd9fa5256d26f1e9898a819c4a393ddd0db1b2399c90e8 packages.nl.gz -META SHA256 89aa0713b08e90f236eff93f3a8ba5ef1c9a61425c214ac655698e36bccff8f5 packages.pl.gz -META SHA256 aa6b2d20304fc107689d467f6429aee89511e977a4b83b6dd463ceb0d26a450b packages.pt.gz -META SHA256 51f3c201955ed4e75fff64668d366154517914adcb1815523dddf245c49058ad packages.pt_BR.gz -META SHA256 4174f1201bccb8df8c35e3d2f68fac253286eeefc7fdd3b52e16df574864f0a8 packages.ru.gz -META SHA256 16f227617049ab685901fec9132d472ed8f3b41c3059c775a9a934929b86640a packages.zh_CN.gz -META SHA256 2f4636d20dedc934440f265800ef056fb4763a201d6c826e6e7f33d63795a4dd patterns -HASH SHA256 88e80af6d7d00c9e1c68394af40079407e243ae10f508d68843cf15bb41e2eaf license.tar.gz -HASH SHA256 74c04e33bbac86db0cd5af004d08cf19af62c81d179c7018678206c267c6f8b2 control.xml -HASH SHA256 b5b09c6fbc81f7c5b00ac38a5dc768bad2601ef48d1c1b2df28009ff28a87c0a boot/x86_64/arabic-fonts.rpm -HASH SHA256 0a43cd62931660b87821bed8470b972e86bf173a5b29536ac6d2449e86cd87f3 boot/x86_64/arphic-uming-fonts.rpm -HASH SHA256 906038fec0baed45e80ee9edffb303ab6ab6b8b624d5721d9fd8f47e276dca8d boot/x86_64/bind -HASH SHA256 a4859679441c231b57caa1ed84eeec11bb0217574a83f938defaa1dbe37a5d2b boot/x86_64/branding -HASH SHA256 c8109a0a4fde9646ca1e8bc502c1f0bda214df5cb32ae09ac46721028e337a83 boot/x86_64/common -HASH SHA256 bbfa1254ebddb53373f9450892edf5af235639de753469ec5f4da9a8184131f8 boot/x86_64/config -HASH SHA256 e7bf49433cdd4ee14924ed3dcb2f259ae7bfab1ceb60fa1545ac526a90b7ee0f boot/x86_64/cracklib-dict-full.rpm -HASH SHA256 6657adc65688f67381eb08e2bb2b2245bd6aa2d32bcba9a61f3c9aeaa415fd02 boot/x86_64/efi -HASH SHA256 1462345268f15c8d83ba353614649b44100ef8411b3b5841a492f164a287536d boot/x86_64/gdb -HASH SHA256 1b15d6d28bc74279941fdaaaa93ef39345ff9ef1c5f91fdc86692c60796c42f4 boot/x86_64/indic-fonts.rpm -HASH SHA256 5ae12d76d2ef210416347630d125d9de93b2abeade0676ff728d9392c0f3db2b boot/x86_64/initrd-xen -HASH SHA256 202817279ab2ea62c041257fc90bd0fad45f2ee8ac4178a3d3f99f4da5c48326 boot/x86_64/ipa-gothic-fonts.rpm -HASH SHA256 8503c74be2fefab329fc6b6ce4605b16efcc491f616831f26960080bcda893af boot/x86_64/khmeros-fonts.rpm -HASH SHA256 01b9029a0653995c15f98114145db918b7ccb4f284f4343b957b83d8ebaf306c boot/x86_64/lklug-fonts.rpm -HASH SHA256 a28408defa649eb0b765b9d50752ae27d66d59a92e9659168a29f1c94fa7e7c9 boot/x86_64/mkbootdisk -HASH SHA256 a4859679441c231b57caa1ed84eeec11bb0217574a83f938defaa1dbe37a5d2b boot/x86_64/openSUSE -HASH SHA256 83ae6c1b0b2d2f11e35099b42ebc74a56d8b57ad54aec6cfeb8773ac8ec0ee2b boot/x86_64/rescue -HASH SHA256 c3aedcbacdab15d85f80864946f69760bd8ce03f5a698abfa14aaef7fc5ca6cd boot/x86_64/root -HASH SHA256 24d328ef64d5921afcc3488cbfcf9b7b7ae5a306f316e5a0d28f52b95c4ec75e boot/x86_64/rpmlist -HASH SHA256 ec62cca55983dd1051fdabd6019198a3710db30ba5d854834c1fae4eb3fae200 boot/x86_64/thai-fonts.rpm -HASH SHA256 8ceed03c8ef4456bba703280af0da873529512fed2cc426bcc9561d08f893743 boot/x86_64/un-fonts.rpm -HASH SHA256 8138638d5607f5b5a9f333fb786aad99a81f31c833412c26e496542f1d63243d boot/x86_64/vmlinuz-xen -HASH SHA256 78df153357ec508359bbc793b13f595b9e4d5aeb6374b3de96fa6584007652a2 boot/x86_64/yast2-trans-af.rpm -HASH SHA256 fa72160684044687669b0b1140043b41ec122ba1c9404b9417478cf1bf2de3bd boot/x86_64/yast2-trans-ar.rpm -HASH SHA256 6ba65a3a97b92365b6a8af3bcd3a309a8de189a38c0700f5d1b26f6f1540e129 boot/x86_64/yast2-trans-bg.rpm -HASH SHA256 7d2262e53d7b4bf3bde8beab827adb3a27b7f189091d29f6fd35f384757137a7 boot/x86_64/yast2-trans-bn.rpm -HASH SHA256 effd28b8ce6760022570cb79654d8e56aa7071adabcf8d392d7c677c89ea2a3b boot/x86_64/yast2-trans-bs.rpm -HASH SHA256 8e7130a38937cd332a59d64f3109a709f9ca3db304bae1d70cc98571404da67b boot/x86_64/yast2-trans-ca.rpm -HASH SHA256 6ff78cad8530930f42dcfe92f2bcb7aa629a5cf2dc881bcbc6e7299d6bbde752 boot/x86_64/yast2-trans-cs.rpm -HASH SHA256 f873c8f29be001e711e69226ae5b14ed6336ddbe3213284db148383abcfea4fd boot/x86_64/yast2-trans-cy.rpm -HASH SHA256 50d5b57e7d309e34788dbf5047b144a61c0037aaddeacbcef5b5904ba67d38fb boot/x86_64/yast2-trans-da.rpm -HASH SHA256 0367f050e6d0bff8aee1ce6568177937b944a2510adcf1024c1cad4cff7f7a45 boot/x86_64/yast2-trans-de.rpm -HASH SHA256 020d33d35b9cd2f28cf5640bbcc3159446c3e1df78e10147b09e7a0351b331c4 boot/x86_64/yast2-trans-el.rpm -HASH SHA256 96cc2db2319f0b7945dd22feba9a150b44f20510aac2b8e71eb70194a76d6980 boot/x86_64/yast2-trans-en_GB.rpm -HASH SHA256 91f982f4605aeb319b918a54fc4d9dae3a7bd4c59a572b0472808785764f8876 boot/x86_64/yast2-trans-en_US.rpm -HASH SHA256 f9ad4f5c50550a7cdb64dda80e04328b587badde74183226d4be0385bca5e448 boot/x86_64/yast2-trans-es.rpm -HASH SHA256 38c9a284592feb4699ac7ff2e583bf7ac6478544493b3c7dbbec92b7176d917d boot/x86_64/yast2-trans-et.rpm -HASH SHA256 44be0d078928806c801c4e49888636b4cb53badf677047e555557263d012cfef boot/x86_64/yast2-trans-fa.rpm -HASH SHA256 82940fd86ad553cb5e9ea04a12607066897f02fa6f86eb88f8fd9131202abeda boot/x86_64/yast2-trans-fi.rpm -HASH SHA256 e283339638c62a6c4da3bcd938f853f5f93f6f4ee5bd5993704aa9fb96a59954 boot/x86_64/yast2-trans-fr.rpm -HASH SHA256 3eff60446d38e5b3ced9367a18bd216ea32386b300f1f6c96438b0c908187b08 boot/x86_64/yast2-trans-gl.rpm -HASH SHA256 1924ccab5c86257b1a46c510bbf8e6be29eb56e9126e08fa01aea3e222bb86ed boot/x86_64/yast2-trans-gu.rpm -HASH SHA256 12410aa1644198d0d843b2ec3f9f756aacc51d31b8271aa40b52bca774e953be boot/x86_64/yast2-trans-hi.rpm -HASH SHA256 4d7140f794bf85ea28a53f0d74bc0da299cdcdad780a23ddd369633bd05753df boot/x86_64/yast2-trans-hr.rpm -HASH SHA256 2fe82d1ccc01367b54c8576044353b78bc51cd3f6a95f61bce527924fb43b382 boot/x86_64/yast2-trans-hu.rpm -HASH SHA256 439532f45f1302523013844fe5c424829e52ce6bfdf98bf2daed953bffd39c8a boot/x86_64/yast2-trans-id.rpm -HASH SHA256 18aba1dd3e21db1bf88052f7c761df2a28e7e1c04024893217b20544e6317ed0 boot/x86_64/yast2-trans-it.rpm -HASH SHA256 3bf826b3d9fcbdd80bd2295afc72be6ec3905c69ff2d5042e06ba2a53ddac8d8 boot/x86_64/yast2-trans-ja.rpm -HASH SHA256 d54f9428c169f541966735589335e61bc5b25e3b87299f8bde7433f0449420ab boot/x86_64/yast2-trans-jv.rpm -HASH SHA256 40b606e7ef982c0437e2783cdb32a1574600891fa7ab73b39a843681557bbb68 boot/x86_64/yast2-trans-ka.rpm -HASH SHA256 4cd0b59a05ef80ad2e032a8c48b78604d0ba8177eaeeff8bb4d3a5b336f29ca7 boot/x86_64/yast2-trans-km.rpm -HASH SHA256 7ed47f3a0b31a1d108e6ea9f8632b320a6cd2ee6500cc3cc3eaeb073f174f590 boot/x86_64/yast2-trans-ko.rpm -HASH SHA256 eb284f364568f21caab714ea310f1312340f19d1eee33c6d738e82892c0cfb20 boot/x86_64/yast2-trans-lo.rpm -HASH SHA256 f9fde6182669f1353783255288838efafe74576e1480fb193e867d0c2d9214d0 boot/x86_64/yast2-trans-lt.rpm -HASH SHA256 c3abd9c551a785f88f95f40c82f982fc28d8d8b4dd8df7b9bc1cc1a6a4aebf41 boot/x86_64/yast2-trans-mk.rpm -HASH SHA256 9ee12d09ec5908af3c42e99b60fa09c4dd5e6007896c2a21e96f00d4e905a9e3 boot/x86_64/yast2-trans-mr.rpm -HASH SHA256 49f10b91685bb03a13270f4d19c7aeca3a0c974e7d4093373217b2e93bef1d2f boot/x86_64/yast2-trans-nb.rpm -HASH SHA256 8cea01ddc6adc5599f448b2116d32628e4712e92b5f3a9faa9657abb7b0ab8b3 boot/x86_64/yast2-trans-nl.rpm -HASH SHA256 595600b69f6eda4864020e3d1fe620de73db2efd7705461b7a69acc59157de64 boot/x86_64/yast2-trans-pa.rpm -HASH SHA256 d33cba6e4203394d56e93569f04a1508cb8631b450dcd5aac9e212d6be2200c1 boot/x86_64/yast2-trans-pl.rpm -HASH SHA256 756faaa0323c541d825349d56dadbd14b493d82da4a1f1ae78aedbc65634f7aa boot/x86_64/yast2-trans-pt.rpm -HASH SHA256 edb11e44887e4014978c6286fbe8f3095eff9ccaf7610087553eb5db7c1b59a2 boot/x86_64/yast2-trans-pt_BR.rpm -HASH SHA256 b13d9e05098792e8e393dc8c48bcfd4ecbb0f815e8f5e3d5fbf8aaa9515ec60c boot/x86_64/yast2-trans-ro.rpm -HASH SHA256 cd297f102ad6aacb82794292b4db0e37ec14ebde8b8b20ea8c34bd985237058f boot/x86_64/yast2-trans-ru.rpm -HASH SHA256 1d99700886396e5bcfde2cb3cccbf6bec0382303d6bcc116e18825237ba03fed boot/x86_64/yast2-trans-si.rpm -HASH SHA256 0ab012464067a601d191933f1dfd0cc813bd9ffb3dbe7f636dfd3e2d86710285 boot/x86_64/yast2-trans-sk.rpm -HASH SHA256 59dfe030555208c9bb8a87b28f3e8b88370ab9e02ef8c172cac6d6f953def2b9 boot/x86_64/yast2-trans-sl.rpm -HASH SHA256 8a934ef66bc060710c386e5c6096bf451743797c2fa3935131c4e6a46f135163 boot/x86_64/yast2-trans-sr.rpm -HASH SHA256 4a4a04558d1558f168feaa4503bb7af5080eed5e79c3c775eec38c5deedbd61e boot/x86_64/yast2-trans-sv.rpm -HASH SHA256 5226a2b01c2ce81b7e0f81b359a3f3b5abe77113f4c640cb791c72a5971017d0 boot/x86_64/yast2-trans-ta.rpm -HASH SHA256 3bc3031532e509120043d03d25f3ea6d54d23ee8f5747a9fdc9e94794bc2b005 boot/x86_64/yast2-trans-th.rpm -HASH SHA256 55d3fb46ff64b656f4d32866be5d7485fddb4eec968a9cc190df17304e94edbf boot/x86_64/yast2-trans-tr.rpm -HASH SHA256 b4a9c8a35aa3eed1ce9e1f2766a0f8735e9e2950b87461917ec85d1c4b4e6792 boot/x86_64/yast2-trans-uk.rpm -HASH SHA256 a05bd29d45ac72c00be0a4ecc012acae6ebce784bc85c86f5a7ffc0c338b708f boot/x86_64/yast2-trans-vi.rpm -HASH SHA256 81a8c545cbbe3a76c55aab171d36ac0a32974924dc7ad7a4e3ab1b56b98a5cf7 boot/x86_64/yast2-trans-wa.rpm -HASH SHA256 f3f1348524de5df7ed502d49e3e92289c562c6c3528d73abb1e2c7164e6cd32a boot/x86_64/yast2-trans-xh.rpm -HASH SHA256 c10e9fa8b905a4e002c6aa83ce11e6e9cbdf3419cdb84b47f71ebc520d2bbb89 boot/x86_64/yast2-trans-zh_CN.rpm -HASH SHA256 7182aebe7a28a0c0fb2fe80a86004bcac1a5df388844fb1072b057a7ec620ad9 boot/x86_64/yast2-trans-zh_TW.rpm -HASH SHA256 8709e4079ebf7a40aefe944397446345ff3360432435d6ec706d1eef0fd463d3 boot/x86_64/yast2-trans-zu.rpm -HASH SHA256 8d7ebcc6110be10e4c92efcb22b9ec18eb7ca47082d0e1c75469762c3c6da896 boot/x86_64/loader/linux -HASH SHA256 7133889fd485bb79cd8faeaade82962bc1725b0e55ab25963e1c7079b33f55cc boot/x86_64/loader/initrd -HASH SHA256 29da2d4800c56997f42b0b3b1fa2217e4941d5190b2c65495302a4ab19b2b424 docu/RELEASE-NOTES.en.html -HASH SHA256 29da2d4800c56997f42b0b3b1fa2217e4941d5190b2c65495302a4ab19b2b424 docu/RELEASE-NOTES.en.rtf -HASH SHA256 d6d275f7c9fdf9a35e4f9028de1cd5497bba23532df6aaef421bbd69765e3abc images/base-meta-x86_64.tar.xz -HASH SHA256 cad69c81b7e1484d61632e583b7bfe057a3f829356ada53fd6e37d93ffc1299c images/base-x86_64.tar.xz -HASH SHA256 1028483b2f5aad6068f0c3a3f83841b86dcd50adac84ea4b91cdef9d9428f0f8 images/common-base-x86_64.tar.xz -HASH SHA256 8e08dace336fc6f8d233208a41392526c82a8230463d799c2b797158bf95d38d images/common-desktop-x86_64.tar.xz -HASH SHA256 c15a8d4461c53883a21b8d9a847b8223c2b79b766bb6b583457bf3850bb2b2ad images/common-xorg-x86_64.tar.xz -HASH SHA256 28bb97af6cb529c464a196ba0e8368ac8e7e74a7a4048a6cc70f5f7dea3588dc images/details-x86_64.xml -HASH SHA256 f965bbecd18f0a909ce29468132145552aa3bb34ced8706afc428bdf6412b300 images/gnome-meta-x86_64.tar.xz -HASH SHA256 0b2545bc48852eab8ffad9954013c303b6b8d686b4e017304cf75155be3cd4ab images/gnome-x86_64.tar.xz -HASH SHA256 2e178f14f455c7d90bde72026c59b38d76ba41d1973a6940f6bca55b98580022 images/images.xml -HASH SHA256 f4cb3b17c8516bb464ec867461bbab4863c2405de144da477d156a169f192bf3 images/kde-meta-x86_64.tar.xz -HASH SHA256 416acadec90c0f351dbf7e18cca46c04d093ef2b8ce3ed7e50fffbfd3e8e9a4a images/kde-x86_64.tar.xz -HASH SHA256 0eb8dfc715e6506233d8f935cbc46d287d3b63af1e2338211e829b5b99ef9684 images/x11-meta-x86_64.tar.xz -HASH SHA256 39b5f8b2195699863e9ea6d8064f35c70835e7213cabd10b6d4ca6de4d1e1b9b images/x11-x86_64.tar.xz -KEY SHA256 d9f574c69457dc5ee30d8d143484677379d2e9229fa9fb7986462dd716d08ad6 gpg-pubkey-307e3d54-4be01a65.asc -KEY SHA256 d44bd0be5ac11f1ca9b613375ef3d799d1d2ce83fa122d2e6366702af7100cb6 gpg-pubkey-3dbdc284-4be1884d.asc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.3.4/package/yast2.changes new/yast2-3.3.6/package/yast2.changes --- old/yast2-3.3.4/package/yast2.changes 2017-07-21 16:47:08.384722812 +0200 +++ new/yast2-3.3.6/package/yast2.changes 2017-07-31 11:06:26.308824981 +0200 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Mon Jul 31 08:23:57 UTC 2017 - jreidinger(a)suse.com + +- WorkflowManager: allow to extend workflow from rpm package + (needed for FATE#323450) +- WorkflowManager: drop never used support to extend workflow from + pattern +- 3.3.6 + +------------------------------------------------------------------- +Thu Jul 27 12:28:09 UTC 2017 - jreidinger(a)suse.com + +- drop reading /content file (FATE#322386) +- 3.3.5 + +------------------------------------------------------------------- Fri Jul 21 14:18:57 UTC 2017 - lslezak(a)suse.cz - cwm/rspec.rb: added tests in "CWM::RadioButtons" group for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.3.4/package/yast2.spec new/yast2-3.3.6/package/yast2.spec --- old/yast2-3.3.4/package/yast2.spec 2017-07-21 16:47:08.384722812 +0200 +++ new/yast2-3.3.6/package/yast2.spec 2017-07-31 11:06:26.308824981 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.3.4 +Version: 3.3.6 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0

1 0

commit yast2-country for openSUSE:Factory
by root＠hilbert.suse.de 02 Aug '17

02 Aug '17

Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2017-08-02 11:26:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-country" Wed Aug 2 11:26:46 2017 rev:183 rq:512863 version:3.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2017-06-22 10:35:12.557469742 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2017-08-02 11:26:47.569844394 +0200 @@ -1,0 +2,8 @@ +Thu Jul 27 11:19:13 UTC 2017 - jreidinger(a)suse.com + +- No longer read /content file from media, instead language from + control.xml is used and list of supported languages is dropped + (FATE#322386) +- 3.3.0 + +------------------------------------------------------------------- Old: ---- yast2-country-3.2.12.tar.bz2 New: ---- yast2-country-3.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.ybIZ0s/_old 2017-08-02 11:26:48.477716039 +0200 +++ /var/tmp/diff_new_pack.ybIZ0s/_new 2017-08-02 11:26:48.481715474 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.2.12 +Version: 3.3.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-country-3.2.12.tar.bz2 -> yast2-country-3.3.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.12/language/src/modules/Language.rb new/yast2-country-3.3.0/language/src/modules/Language.rb --- old/yast2-country-3.2.12/language/src/modules/Language.rb 2017-06-20 09:46:51.649714053 +0200 +++ new/yast2-country-3.3.0/language/src/modules/Language.rb 2017-07-28 09:47:23.953816176 +0200 @@ -599,8 +599,8 @@ end if Stage.initial && !Mode.live_installation - lang = Convert.to_string(SCR.Read(path(".content.LANGUAGE"))) - Builtins.y2milestone("content LANGUAGE %1", lang) + lang = ProductFeatures.GetStringFeature("globals", "language") + Builtins.y2milestone("product LANGUAGE %1", lang) @preselected = Linuxrc.InstallInf("Locale") Builtins.y2milestone("install_inf Locale %1", @preselected) @@ -1318,39 +1318,10 @@ # check if selected language has support on media (F301238) # show a warning when not - def CheckLanguagesSupport(selected_language) - linguas = Convert.to_string(SCR.Read(path(".content.LINGUAS"))) - - if linguas == nil - Builtins.y2warning("No LINGUAS tag defined in content file") - return - end - - Builtins.y2milestone("content LINGUAS %1", linguas) - all_linguas = Builtins.splitstring(linguas, " ") - language_short = Ops.get( - Builtins.splitstring(selected_language, "_"), - 0, - "" - ) - - if !Builtins.contains(all_linguas, selected_language) && - !Builtins.contains(all_linguas, language_short) - Builtins.y2milestone( - "Language %1 is not fully supported", - selected_language - ) - # popup message - Popup.Message( - _( - "Only minimal support for the selected language is included on this media.\n" + - "Enable online repositories later in order to get the appropriate support\n" + - "for this language.\n" - ) - ) - end - - nil + # @deprecated does nothing + def CheckLanguagesSupport(_selected_language) + log.warn "Called check for language support, but it does nothing" + return end # Set current YaST language to English if method for showing text in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.12/package/yast2-country.changes new/yast2-country-3.3.0/package/yast2-country.changes --- old/yast2-country-3.2.12/package/yast2-country.changes 2017-06-20 09:46:51.649714053 +0200 +++ new/yast2-country-3.3.0/package/yast2-country.changes 2017-07-28 09:47:23.957816176 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jul 27 11:19:13 UTC 2017 - jreidinger(a)suse.com + +- No longer read /content file from media, instead language from + control.xml is used and list of supported languages is dropped + (FATE#322386) +- 3.3.0 + +------------------------------------------------------------------- Mon Jun 19 14:45:17 UTC 2017 - gsouza(a)suse.com - Alterations in vconsole.conf performed by localectl and not diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.12/package/yast2-country.spec new/yast2-country-3.3.0/package/yast2-country.spec --- old/yast2-country-3.2.12/package/yast2-country.spec 2017-06-20 09:46:51.649714053 +0200 +++ new/yast2-country-3.3.0/package/yast2-country.spec 2017-07-28 09:47:23.957816176 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.2.12 +Version: 3.3.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build

1 0

commit yast2-packager for openSUSE:Factory
by root＠hilbert.suse.de 02 Aug '17

02 Aug '17

Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2017-08-02 11:26:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager" Wed Aug 2 11:26:40 2017 rev:338 rq:512861 version:3.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2017-07-22 02:31:59.147403795 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2017-08-02 11:26:43.330443760 +0200 @@ -1,0 +2,16 @@ +Thu Jul 27 11:12:01 CEST 2017 - schubi(a)suse.de + +- AutoYaST: Configuring EULA acceptance of add-on products has + not worked if the add-on product is on the medium of the base + product too. (bnc#1032523). + Now the add-on product has to be defined in the AutoYaST + configuration file explicit. +- 3.3.2 + +------------------------------------------------------------------- +Wed Jul 26 14:18:31 UTC 2017 - jreidinger(a)suse.com + +- drop reading "/content" file (FATE#322386) +- 3.3.1 + +------------------------------------------------------------------- Old: ---- yast2-packager-3.3.0.tar.bz2 New: ---- yast2-packager-3.3.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.4ezJ5D/_old 2017-08-02 11:26:45.174183092 +0200 +++ /var/tmp/diff_new_pack.4ezJ5D/_new 2017-08-02 11:26:45.178182527 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.3.0 +Version: 3.3.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-packager-3.3.0.tar.bz2 -> yast2-packager-3.3.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.3.0/package/yast2-packager.changes new/yast2-packager-3.3.2/package/yast2-packager.changes --- old/yast2-packager-3.3.0/package/yast2-packager.changes 2017-07-20 13:40:44.767976013 +0200 +++ new/yast2-packager-3.3.2/package/yast2-packager.changes 2017-07-28 09:44:36.217816176 +0200 @@ -1,4 +1,20 @@ ------------------------------------------------------------------- +Thu Jul 27 11:12:01 CEST 2017 - schubi(a)suse.de + +- AutoYaST: Configuring EULA acceptance of add-on products has + not worked if the add-on product is on the medium of the base + product too. (bnc#1032523). + Now the add-on product has to be defined in the AutoYaST + configuration file explicit. +- 3.3.2 + +------------------------------------------------------------------- +Wed Jul 26 14:18:31 UTC 2017 - jreidinger(a)suse.com + +- drop reading "/content" file (FATE#322386) +- 3.3.1 + +------------------------------------------------------------------- Thu Jul 20 06:44:42 UTC 2017 - lslezak(a)suse.cz - Less strict low memory detection, there might be some rounding diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.3.0/package/yast2-packager.spec new/yast2-packager-3.3.2/package/yast2-packager.spec --- old/yast2-packager-3.3.0/package/yast2-packager.spec 2017-07-20 13:40:44.767976013 +0200 +++ new/yast2-packager-3.3.2/package/yast2-packager.spec 2017-07-28 09:44:36.217816176 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.3.0 +Version: 3.3.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.3.0/src/clients/inst_mediacopy.rb new/yast2-packager-3.3.2/src/clients/inst_mediacopy.rb --- old/yast2-packager-3.3.0/src/clients/inst_mediacopy.rb 2017-07-20 13:40:44.807976013 +0200 +++ new/yast2-packager-3.3.2/src/clients/inst_mediacopy.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,147 +0,0 @@ -# encoding: utf-8 - -# Module: inst_mediacopy.ycp -# -# Authors: Anas Nashif <nashif(a)suse.de> -# -# Purpose: Copy Media to local disk -# -# $Id$ -# -module Yast - class InstMediacopyClient < Client - def main - Yast.import "Pkg" - textdomain "packager" - - Yast.import "Label" - Yast.import "Popup" - Yast.import "Wizard" - Yast.import "Packages" - Yast.import "PackageCallbacks" - Yast.import "PackageCallbacksInit" - Yast.import "Installation" - Yast.import "GetInstArgs" - Yast.import "String" - - @source_list = [] - - # full initialization is required for Pkg::SourceMediaData() - Packages.Init(true) - @num = Builtins.size(Packages.theSources) - if Ops.less_or_equal(@num, 0) - Builtins.y2error("No repository") - else - Builtins.foreach(Packages.theSources) do |i| - new_product = Pkg.SourceProductData(i) - @source_list = Builtins.add( - @source_list, - Item( - Id(i), - Ops.get_string(new_product, "productname", "?"), - Ops.get_string(new_product, "productversion", "?") - ) - ) - end - end - - # dialog heading - @heading_text = _("Copy Installation Media") - # help text - @help_text = _( - "The installation CDs will be copied into the system\n" + - "to create a repository that can be used to install\n" + - "other systems.\n" - ) - # label for showing repositories - @label = _("Registered Repositories") - - @contents = VBox( - HCenter( - HSquash( - VBox( - HSpacing(40), # force minimum width - Left(Label(@label)), - Table(Id(:sources), Header(_("Name"), _("Version")), @source_list) - ) - ) - ), - VSpacing(2) - ) - - Wizard.SetContents( - @heading_text, - @contents, - @help_text, - GetInstArgs.enable_back, - GetInstArgs.enable_next - ) - - @dest = "" - if SCR.Read(path(".target.dir"), Ops.add(Installation.destdir, "/export")) == nil - SCR.Execute( - path(".target.mkdir"), - Ops.add(Installation.destdir, "/export") - ) - end - @dest = Ops.add(Installation.destdir, "/export") - - PackageCallbacksInit.SetMediaCallbacks - - @s = Pkg.SourceGetCurrent(false) - Builtins.y2milestone("%1", @s) - - Builtins.foreach(@s) do |source| - md = Pkg.SourceMediaData(source) - pd = Pkg.SourceProductData(source) - distprod = Ops.get_string(pd, "label", "") - l = Builtins.splitstring(distprod, " ") - distprod = Builtins.mergestring(l, "-") - updir = Convert.to_string(SCR.Read(path(".etc.install_inf.UpdateDir"))) - __export = "" - if updir == nil - __export = Ops.add(@dest, "/dist") - else - __export = Ops.add(@dest, updir) - end - changed_url = false - i = 1 - while Ops.less_or_equal(i, Ops.get_integer(md, "media_count", 0)) - tgt = Builtins.sformat("%1/%2/CD%3", __export, distprod, i) - Builtins.y2debug("tgt: %1", tgt) - #Popup::Message(sformat(_("Before... %1"), i )); - dir = Pkg.SourceProvideDirectory(source, i, ".", false, false) - #Popup::Message(sformat(_("After... %1"), i )); - if dir != nil - # feedback popup 1/2 - Popup.ShowFeedback( - _("Copying CD contents to a local directory..."), - # feedback popup 2/2 - _("Please wait...") - ) - SCR.Execute(path(".target.mkdir"), tgt) - #string cmd = sformat("cd %1 && tar cf - . | (cd %2 && tar xBf -)", dir, tgt); - cmd = Builtins.sformat( - "cp '%1/content' '%2'", - String.Quote(Builtins.tostring(dir)), - String.Quote(tgt) - ) - SCR.Execute(path(".target.bash"), cmd) - - if !changed_url - Pkg.SourceChangeUrl(source, Ops.add("dir://", tgt)) - changed_url = true - end - - Popup.ClearFeedback - end - i = Ops.add(i, 1) - end - end - - :next - end - end -end - -Yast::InstMediacopyClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.3.0/src/modules/AddOnProduct.rb new/yast2-packager-3.3.2/src/modules/AddOnProduct.rb --- old/yast2-packager-3.3.0/src/modules/AddOnProduct.rb 2017-07-20 13:40:44.883976013 +0200 +++ new/yast2-packager-3.3.2/src/modules/AddOnProduct.rb 2017-07-28 09:44:36.241816176 +0200 @@ -780,119 +780,19 @@ nil end - # Checks whether the content file of the add-on has a flag REGISTERPRODUCT - # set to "true" or "yes". If it has, product is added into list of pruducts - # that need registration. Cached content file is used if possible. + # Checks whether the addon at src_id need registration + # If it has, product is added into list of products that need registration. # # @param [Fixnum] src_id source id def PrepareForRegistration(src_id) control_file = WorkflowManager.GetCachedWorkflowFilename(:addon, src_id, ""); - if WorkflowManager.IncorporateControlFileOptions(control_file) == true + return unless WorkflowManager.IncorporateControlFileOptions(control_file) # FATE #305578: Add-On Product Requiring Registration - if WorkflowManager.WorkflowRequiresRegistration(src_id) - Builtins.y2milestone("REGISTERPRODUCT (require_registration) defined in control file") - @addons_requesting_registration << deep_copy(src_id) - return nil - end - end - - - tmpdir = Ops.add( - Convert.to_string(SCR.Read(path(".target.tmpdir"))), - "/add-on-content-files/" - ) - - # create directory if doesn't exist - if !FileUtils.Exists(tmpdir) - run = Convert.to_integer( - SCR.Execute( - path(".target.bash"), - Builtins.sformat("/bin/mkdir -p '%1'", tmpdir) - ) - ) - if run != 0 - Builtins.y2error("Cannot create directory %1", tmpdir) - return nil - end - end + return unless WorkflowManager.WorkflowRequiresRegistration(src_id) - # use cached file if possible - contentfile = Builtins.sformat("%1content-%2", tmpdir, src_id) - if FileUtils.Exists(contentfile) - Builtins.y2milestone("Using cached contentfile %1", contentfile) - else - Builtins.y2milestone("Checking contentfile from repository") - sourcefile = GetCachedFileFromSource( - src_id, - 1, - "/content", - "signed", - true - ) - if sourcefile == nil - Builtins.y2warning("Cannot obtain content file!") - return nil - end - # copying content file - run = Convert.to_integer( - SCR.Execute( - path(".target.bash"), - Builtins.sformat( - "/bin/cp '%1' '%2'", - String.Quote(sourcefile), - String.Quote(contentfile) - ) - ) - ) - if run != 0 - Builtins.y2error("Cannot copy '%1' to '%2'", sourcefile, contentfile) - return nil - end - end - - # registering agent for the current content file - SCR.RegisterAgent( - path(".addon.content"), - term( - :ag_ini, - term( - :IniAgent, - contentfile, - { - "options" => ["read_only", "global_values", "flat"], - "comments" => ["^#.*", "^[ \t]*$"], - "params" => [ - { - "match" => [ - "^[ \t]*([a-zA-Z0-9_.]+)[ \t]*(.*)[ \t]*$", - "%s %s" - ] - } - ] - } - ) - ) - ) - register_product = Convert.to_string( - SCR.Read(path(".addon.content.REGISTERPRODUCT")) - ) - SCR.UnregisterAgent(path(".addon.content")) - - # evaluating REGISTERPRODUCT flag, default (nil == false) - Builtins.y2milestone( - "RegisterProduct flag for repository %1 is %2", - src_id, - register_product - ) - if register_product == "yes" || register_product == "true" - @addons_requesting_registration = Builtins.add( - @addons_requesting_registration, - src_id - ) - end - - nil + log.info "REGISTERPRODUCT (require_registration) defined in control file" + @addons_requesting_registration << deep_copy(src_id) end # Calls registration client if needed. @@ -900,7 +800,6 @@ # @param [Fixnum] src_id source id def RegisterAddOnProduct(src_id) # FATE #305578: Add-On Product Requiring Registration - # or check the content file if WorkflowManager.WorkflowRequiresRegistration(src_id) || Builtins.contains(@addons_requesting_registration, src_id) Builtins.y2milestone("Repository ID %1 requests registration", src_id) @@ -1006,146 +905,6 @@ "Add-On-Product-ID:#{src_id}" end - # See also DeselectProductPatterns() - def SelectProductPatterns(content_file, src_id) - patterns_to_select = [] - - if content_file && File.exist?(content_file) - contentmap = Convert.to_map(SCR.Read(path(".content_file"), content_file)) || {} - - # no PATTERNS defined - if !contentmap.key?("PATTERNS") - log.info "Add-On doesn't have any required patterns (PATTERNS in content)" - end - - # parsing PATTERNS - patterns_to_select = contentmap.fetch("PATTERNS", "").split(/[\t ]/) - patterns_to_select.reject! { |p| p.nil? || p.empty? } - end - - product_patterns = ProductPatterns.new(src: @src_id) - log.info "Found default product patterns: #{product_patterns.names}" - patterns_to_select.concat(product_patterns.names) - patterns_to_select.uniq! - - log.info "Add-On requires these patterns: #{patterns_to_select.inspect}" - - # clear/set - @patterns_preselected_by_addon[src_id] = [] - - # bnc #458297 - # Using PackagesProposal to select the patterns itself - PackagesProposal.SetResolvables( - PackagesProposalAddonID(src_id), - :pattern, - patterns_to_select - ) - - if Stage.initial - log.info "Using PackagesProposal to select Add-On patterns" - return true - end - - ret = true - - Builtins.foreach(patterns_to_select) do |one_pattern| - pattern_properties = Pkg.ResolvableProperties(one_pattern, :pattern, "") - already_selected = false - Builtins.foreach(pattern_properties) do |one_pattern_found| - patt_status = Ops.get_symbol(one_pattern_found, "status", :unknown) - # patern is already selected - if patt_status == :installed || patt_status == :selected - already_selected = true - raise Break - end - end - if already_selected - Builtins.y2milestone( - "Pattern %1 is already installed/selected", - one_pattern - ) - next - end - if !Pkg.ResolvableInstall(one_pattern, :pattern) - Builtins.y2error( - "Cannot select pattern: %1, reason: %2", - one_pattern, - Pkg.LastError - ) - ret = false - else - Ops.set( - @patterns_preselected_by_addon, - src_id, - Builtins.add( - Ops.get(@patterns_preselected_by_addon, src_id, []), - one_pattern - ) - ) - end - end - - ret - end - - - # See also SelectProductPatterns() - def DeselectProductPatterns(src_id) - # bnc #458297 - # Using PackagesProposal to deselect the patterns itself - PackagesProposal.SetResolvables( - PackagesProposalAddonID(src_id), - :pattern, - [] - ) - - if Stage.initial - Builtins.y2milestone( - "Initial stage, using PackagesProposal to deselect patterns" - ) - return true - end - - patterns_to_deselect = Ops.get(@patterns_preselected_by_addon, src_id, []) - - if Builtins.size(patterns_to_deselect) == 0 - Builtins.y2milestone("There's no pattern to be deselected") - return true - end - - ret = true - - Builtins.foreach(patterns_to_deselect) do |one_pattern| - if !Pkg.ResolvableNeutral(one_pattern, :pattern, true) - Builtins.y2error( - "Cannot deselect pattern: %1, reason: %2", - one_pattern, - Pkg.LastError - ) - ret = false - end - end - - ret - end - def HandleProductPATTERNS(srcid) - # FATE #302398: PATTERNS keyword in content file - content_file = GetCachedFileFromSource( - srcid, - 1, - "/content", - "signed", - true - ) - - if content_file == nil - Builtins.y2warning("Add-On %1 doesn't have a content file", srcid) - end - - SelectProductPatterns(content_file, srcid) - - nil - end def IntegrateReleaseNotes(repo_id) products = Pkg.ResolvableProperties("", :product, ""). select do |product| @@ -1196,7 +955,8 @@ end # FATE #302398: PATTERNS keyword in content file - HandleProductPATTERNS(srcid) + # changed for software section in installation.xml + # or 'defaultpattern()' product Provides (FATE#320199) # Adds workflow to the Workflow Store if any workflow exists WorkflowManager.AddWorkflow(:addon, srcid, "") @@ -1211,8 +971,6 @@ # # @param [Fixnum] srcid integer the ID of the repository def Disintegrate(srcid) - DeselectProductPatterns(srcid) - WorkflowManager.RemoveWorkflow(:addon, srcid, "") nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.3.0/src/modules/Packages.rb new/yast2-packager-3.3.2/src/modules/Packages.rb --- old/yast2-packager-3.3.0/src/modules/Packages.rb 2017-07-20 13:40:44.927976013 +0200 +++ new/yast2-packager-3.3.2/src/modules/Packages.rb 2017-07-28 09:44:36.245816176 +0200 @@ -46,6 +46,7 @@ def main Yast.import "UI" Yast.import "Pkg" + Yast.import "Mode" textdomain "packager" @@ -280,17 +281,11 @@ # Return information about suboptimal distribution if relevant # @return [String] the information string or empty string def InfoAboutSubOptimalDistribution - # warn about suboptimal distribution - # this depends on the kernel - dp = Convert.to_string(SCR.Read(path(".content.DISTPRODUCT"))) - dp = "" if dp == nil - if ProductFeatures.GetBooleanFeature( "software", "inform_about_suboptimal_distribution" ) && - Arch.i386 && - Builtins.issubstring(dp, "DVD") + Arch.i386 tmp = Convert.to_string( SCR.Read(path(".proc.cpuinfo.value.\"0\".\"flags\"")) ) @@ -838,7 +833,13 @@ "Found list of add-on products to preselect: %1", @add_on_products_list ) - AddOnProduct.AddPreselectedAddOnProducts(@add_on_products_list) + if Mode.auto + Builtins.y2warning( "This is an AutoYaST installation. "\ + "Only Add-on products will be added which have been defined "\ + "in the add-on section of the AutoYaST configuration file." ) + else + AddOnProduct.AddPreselectedAddOnProducts(@add_on_products_list) + end @add_on_products_list = [] # do not select them any more end @@ -1157,33 +1158,6 @@ install_list end - # Check whether content file in the specified repository is the same - # as the one in the ramdisk - # @param [Fixnum] source integer the repository ID to check - # @return [Boolean] true if content files match - def CheckContentFile(source) - Builtins.y2milestone("Checking content file") - instmode = Linuxrc.InstallInf("InstMode") - if !(instmode == nil || instmode == "cd" || instmode == "dvd") - Builtins.y2milestone( - "Installing via network, not checking the content file" - ) - return true - end - if !File.exists?("/content") - Builtins.y2milestone( - "Ramdisk does not contain content file, not checking the file on media" - ) - return true - end - media_content = Pkg.SourceProvideSignedFile(source, 1, "/content", false) - media = Convert.to_string(SCR.Read(path(".target.string"), media_content)) - ramdisk = Convert.to_string(SCR.Read(path(".target.string"), "/content")) - ret = media == ramdisk - Builtins.y2milestone("Content files are the same: %1", ret) - ret - end - # Import GPG keys found in the inst-sys def ImportGPGKeys out = Convert.to_map( @@ -1251,24 +1225,6 @@ deep_copy(ret) end - def ContentFileProductLabel - language = Language.language - locales = LocaleVersions(Language.language) - ret = "" - Builtins.foreach(locales) do |loc| - if ret == "" - val = Convert.to_string( - SCR.Read(Builtins.add(path(".content"), Ops.add("LABEL.", loc))) - ) - if val != "" && val != nil - ret = val - next ret - end - end - end - Convert.to_string(SCR.Read(path(".content.LABEL"))) - end - # Returns ID of the base product repository. # # @return [Fixnum] base source ID @@ -1620,8 +1576,7 @@ true end - # Adjusts repository name according to LABEL in content file - # or a first product found on the media (as a fallback). + # Adjusts repository name according to a first product found on the media. # # @param [Fixnum] src_id repository ID # @return [Boolean] if successful @@ -1635,52 +1590,18 @@ return nil end - Builtins.y2milestone("Trying to adjust repository name for: %1", src_id) + Builtins.y2milestone("Trying to get repository name from products") + all_products = Pkg.ResolvableProperties("", :product, "") new_name = nil - - # At first, try LABEL from content file - contentfile = Pkg.SourceProvideSignedFile( - src_id, # optional - 1, - "/content", - true - ) - if contentfile != nil - contentmap = Convert.to_map( - SCR.Read(path(".content_file"), contentfile) - ) - if Builtins.haskey(contentmap, "LABEL") && - Ops.get(contentmap, "LABEL") != nil && - Ops.get_string(contentmap, "LABEL", "") != "" - new_name = Ops.get_string(contentmap, "LABEL", "") - - if Builtins.regexpmatch(new_name, "^[ \t]+") - new_name = Builtins.regexpsub(new_name, "^[ \t]+(.*)", "\\1") - end - if Builtins.regexpmatch(new_name, "[ \t]+$") - new_name = Builtins.regexpsub(new_name, "(.*)[ \t]+$", "\\1") - end - - Builtins.y2milestone("Using LABEL from content file: %1", new_name) - else - Builtins.y2warning("No (useful) LABEL in product content file") - end - end - - # As a fallback, - if new_name == nil || new_name == "" - Builtins.y2milestone("Trying to get repository name from products") - all_products = Pkg.ResolvableProperties("", :product, "") - Builtins.foreach(all_products) do |one_product| - # source ID matches - if Ops.get_integer(one_product, "source", -1) == src_id - if Builtins.haskey(one_product, "name") && - Ops.get(one_product, "name") != nil && - Ops.get_string(one_product, "name", "") != "" - new_name = Ops.get_string(one_product, "name", "") - Builtins.y2milestone("Product name found: %1", new_name) - raise Break - end + Builtins.foreach(all_products) do |one_product| + # source ID matches + if Ops.get_integer(one_product, "source", -1) == src_id + if Builtins.haskey(one_product, "name") && + Ops.get(one_product, "name") != nil && + Ops.get_string(one_product, "name", "") != "" + new_name = Ops.get_string(one_product, "name", "") + Builtins.y2milestone("Product name found: %1", new_name) + raise Break end end end @@ -1814,24 +1735,9 @@ return end end - if !CheckContentFile(initial_repository) - label = ContentFileProductLabel() - # bug #159754, release the mounted CD - Pkg.SourceReleaseAll - Pkg.SourceDelete(initial_repository) - initial_repository = nil - if !Popup.ContinueCancel( - # message popup, %1 is product name - Builtins.sformat(_("Insert %1 CD 1"), label) - ) - @init_error = Builtins.sformat(_("%1 CD 1 not found"), label) - @init_in_progress = false - return - end - end end - # BNC #481828: Using LABEL from content file as a repository name + # BNC #481828: Using LABEL from product AdjustSourcePropertiesAccordingToProduct(@base_source_id) @base_source_id = initial_repository @@ -2643,7 +2549,6 @@ publish :function => :addAdditionalPackage, :type => "void (string)" publish :function => :ComputeSystemPatternList, :type => "list <string> ()" publish :function => :ComputeSystemPackageList, :type => "list <string> ()" - publish :function => :CheckContentFile, :type => "boolean (integer)" publish :function => :GetBaseSourceID, :type => "integer ()" publish :function => :Init, :type => "void (boolean)" publish :function => :SlideShowSetUp, :type => "void (string)"

1 0

commit yast2-add-on for openSUSE:Factory
by root＠hilbert.suse.de 02 Aug '17

02 Aug '17

Hello community, here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at 2017-08-02 11:26:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old) and /work/SRC/openSUSE:Factory/.yast2-add-on.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-add-on" Wed Aug 2 11:26:35 2017 rev:82 rq:512816 version:3.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes 2017-07-17 10:31:02.576651961 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes 2017-08-02 11:26:36.603394830 +0200 @@ -1,0 +2,7 @@ +Thu Jul 27 08:44:31 UTC 2017 - jreidinger(a)suse.com + +- drop inst_lang_addon client because openSUSE Lang Addon is also + dropped, this drops also all read of /content file (FATE#322386) +- 3.3.0 + +------------------------------------------------------------------- Old: ---- yast2-add-on-3.2.1.tar.bz2 New: ---- yast2-add-on-3.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.Rrkpwz/_old 2017-08-02 11:26:37.495268737 +0200 +++ /var/tmp/diff_new_pack.Rrkpwz/_new 2017-08-02 11:26:37.499268172 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 3.2.1 +Version: 3.3.0 Release: 0 Summary: YaST2 - Add-On media installation code License: GPL-2.0 @@ -65,7 +65,6 @@ %{yast_clientdir}/add-on.rb %{yast_clientdir}/add-on_*.rb %{yast_clientdir}/inst_add-on*.rb -%{yast_clientdir}/inst_*_add-on*.rb %{yast_clientdir}/vendor.rb %{yast_desktopdir}/*.desktop %{yast_schemadir}/autoyast/rnc/add-on.rnc ++++++ yast2-add-on-3.2.1.tar.bz2 -> yast2-add-on-3.3.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.2.1/package/yast2-add-on.changes new/yast2-add-on-3.3.0/package/yast2-add-on.changes --- old/yast2-add-on-3.2.1/package/yast2-add-on.changes 2017-07-11 11:41:05.029789259 +0200 +++ new/yast2-add-on-3.3.0/package/yast2-add-on.changes 2017-07-27 15:50:20.483056797 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jul 27 08:44:31 UTC 2017 - jreidinger(a)suse.com + +- drop inst_lang_addon client because openSUSE Lang Addon is also + dropped, this drops also all read of /content file (FATE#322386) +- 3.3.0 + +------------------------------------------------------------------- Mon Jul 10 15:20:52 UTC 2017 - lslezak(a)suse.cz - Do not skip the boot command line addons ("addon=...") when diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.2.1/package/yast2-add-on.spec new/yast2-add-on-3.3.0/package/yast2-add-on.spec --- old/yast2-add-on-3.2.1/package/yast2-add-on.spec 2017-07-11 11:41:05.029789259 +0200 +++ new/yast2-add-on-3.3.0/package/yast2-add-on.spec 2017-07-27 15:50:20.483056797 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 3.2.1 +Version: 3.3.0 Release: 0 Summary: YaST2 - Add-On media installation code License: GPL-2.0 @@ -65,7 +65,6 @@ %{yast_clientdir}/add-on.rb %{yast_clientdir}/add-on_*.rb %{yast_clientdir}/inst_add-on*.rb -%{yast_clientdir}/inst_*_add-on*.rb %{yast_clientdir}/vendor.rb %{yast_desktopdir}/*.desktop %{yast_schemadir}/autoyast/rnc/add-on.rnc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.2.1/src/clients/inst_language_add-on.rb new/yast2-add-on-3.3.0/src/clients/inst_language_add-on.rb --- old/yast2-add-on-3.2.1/src/clients/inst_language_add-on.rb 2017-07-11 11:41:05.065789259 +0200 +++ new/yast2-add-on-3.3.0/src/clients/inst_language_add-on.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,427 +0,0 @@ -# encoding: utf-8 - -# File: clients/inst_language_add-on.ycp -# Authors: Lukas Ocilka <locilka(a)suse.cz> -# Summary: Template client for language Add-On products -# -# This is a template for Language Add-Ons. It can be either called -# from the installation.xml in the root ("/") of the product or -# called from command-line for testing purposes: -# `yast2 inst_language_add-on.ycp "$[]" url_to_add_on_source`. -# -# $Id$ -module Yast - class InstLanguageAddOnClient < Client - def main - Yast.import "UI" - Yast.import "Pkg" - Yast.import "Kernel" - Yast.import "Language" - Yast.import "Wizard" - Yast.import "Label" - Yast.import "Popup" - - textdomain "add-on" - - Wizard.CreateDialog - Builtins.y2milestone( - "====================[ Language Add-On Script ]====================" - ) - @ret = MainFunction() - Builtins.y2milestone( - "====================[ Language Add-On Script ]====================" - ) - Wizard.CloseDialog - - if @ret == 0 - return :next - else - return :abort - end - end - - # Returns the list of available languages. It is based on the - # "LINGUAS" entry in the /content file. Returns nil if something - # is wrong. - # - # @return [Array<String>] supported languages - # (e.g., ["af", "ar", "be_BY", "bg", "ca", "cs", "cy", "da", "el", "et", "fi"]) - def GetListOfSupportedLanguages(source) - content_file = Pkg.SourceProvideSignedFile(source, 1, "/content", false) - if content_file == nil || content_file == "" - Builtins.y2error("There is no content file!") - return nil - end - - SCR.RegisterAgent( - path(".media.content"), - term( - :ag_ini, - term( - :IniAgent, - content_file, - { - "options" => ["read_only", "global_values", "flat"], - "comments" => ["^#.*", "^[ \t]*$"], - "params" => [ - { - "match" => [ - "^[ \t]*([a-zA-Z0-9_.]+)[ \t]*(.*)[ \t]*$", - "%s %s" - ] - } - ] - } - ) - ) - ) - supported_languages = Builtins.tostring( - SCR.Read(path(".media.content.LINGUAS")) - ) - if supported_languages == nil || supported_languages == "" - Builtins.y2error("No languages [LINGUAS] defined!") - return nil - end - - Builtins.y2milestone("Languages found: %1", supported_languages) - SCR.UnregisterAgent(path(".media.content")) - - Builtins.splitstring(supported_languages, " ") - end - - # Solves dependencies and installs packages - def Install(languages_to_install) - languages_to_install = deep_copy(languages_to_install) - Builtins.y2milestone( - "Installing packages for languages: %1", - languages_to_install - ) - Pkg.SetAdditionalLocales(languages_to_install) - - Builtins.y2milestone("Solving dependencies") - if Pkg.PkgSolve(true) != true - Builtins.y2error("Cannot solve dependencies") - return false - end - - Builtins.y2milestone("Installing packages") - WFM.call("inst_rpmcopy") - - Kernel.InformAboutKernelChange - - Popup.Message( - # TRANSLATORS: popup message - _("Installation of the Language Extension has been finished.") - ) - - true - end - - # Only when WFM::Args[1] contains an URL to be added - def InitFunction - args = WFM.Args - Builtins.y2milestone("Args: %1", args) - add_on_url = Builtins.tostring(Ops.get_string(args, 1, "")) - - if add_on_url == "" - Builtins.y2milestone( - "No URL given as an argument, not initializing source." - ) - return - end - - Builtins.y2milestone("Using URL: '%1'", add_on_url) - - Yast.import "PackageCallbacks" - Yast.import "SourceManager" - - PackageCallbacks.InitPackageCallbacks - - Pkg.TargetInit("/", true) - Pkg.SourceStartManager(true) - - SourceManager.createSource(add_on_url) - - nil - end - - # Dialog definitions --> - - def Dialog_Init - Wizard.SetContentsButtons( - # TRANSLATORS: dialog caption - _("Add-On Product Installation"), - # TRANSLATORS: dialog content - a very simple label - Label(_("Initializing...")), - # TRANSLATORS: help text - _("Initializing add-on products..."), - Label.BackButton, - Label.NextButton - ) - Wizard.SetTitleIcon("yast-language") - Wizard.DisableBackButton - Wizard.DisableAbortButton - Wizard.DisableNextButton - - nil - end - - - - - def Dialog_SelectLanguagesUI(known_languages, already_installed_languages) - items = [] - pre_selected_languages = [] - pre_selected = nil - - # for each language supported on the medium - Builtins.foreach(known_languages.value) do |short, long| - # installed is 'de' or 'cs' or 'zh' - if Builtins.contains(already_installed_languages.value, short) - pre_selected = true - # installed is 'de_XY' or 'cs_AB' or 'zh_CD' - # but not on the medium, find similar - elsif Ops.greater_than(Builtins.size(short), 2) - language_substring = Builtins.substring(short, 0, 2) - if Builtins.contains( - already_installed_languages.value, - language_substring - ) - pre_selected = true - else - pre_selected = false - end - else - pre_selected = false - end - if pre_selected - pre_selected_languages = Builtins.add( - pre_selected_languages, - Builtins.sformat("%1 (%2)", short, long) - ) - end - items = Builtins.add(items, Item(Id(short), long, pre_selected)) - end - Builtins.y2milestone("Preselected languages: %1", pre_selected_languages) - - items = Builtins.sort(items) do |x, y| - Ops.less_than(Ops.get_string(x, 1, ""), Ops.get_string(y, 1, "")) - end - Wizard.SetContentsButtons( - # TRANSLATORS: dialog caption - _("Add-On Product Installation"), - VBox( - HBox( - HStretch(), - MultiSelectionBox( - Id("languages"), - # TRANSLATORS:: multi-selection box - _("&Select Language Extensions to Be Installed"), - items - ), - HStretch() - ) - ), - # TRANSLATORS: help text - _( - "Select the language extensions to be installed then click OK." - ), - Label.BackButton, - Label.OKButton - ) - Wizard.SetTitleIcon("yast-language") - Wizard.DisableBackButton - Wizard.EnableAbortButton - Wizard.EnableNextButton - - selected_languages = nil - ret = nil - while true - ret = UI.UserInput - - if ret == :cancel || ret == :abort - if Popup.YesNo( - # TRANSLATORS: popup question - _( - "Are you sure you want to abort the add-on product installation?" - ) - ) - selected_languages = [] - break - end - elsif ret == :next - selected_languages = Convert.convert( - UI.QueryWidget(Id("languages"), :SelectedItems), - :from => "any", - :to => "list <string>" - ) - if Builtins.size(selected_languages) == 0 - if !Popup.YesNo( - _( - "There are no selected languages to be installed.\nAre you sure you want to abort the installation?" - ) - ) - next - else - Builtins.y2warning( - "User decided not to install any language support." - ) - end - end - - break - end - end - - deep_copy(selected_languages) - end - - - - - def Dialog_SelectLanguages(available_languages, already_installed_languages) - available_languages = deep_copy(available_languages) - if available_languages == nil || available_languages == [] - Builtins.y2error("No availabel languages") - return nil - elsif Builtins.size(available_languages) == 1 - Builtins.y2milestone( - "Only one language available, using %1", - available_languages - ) - return deep_copy(available_languages) - else - known_languages = Language.GetLanguagesMap(false) - - short_to_lang = {} - Builtins.foreach(available_languages) do |one_lang| - # full xx_YY - if Ops.get(known_languages, one_lang) != nil - Ops.set( - short_to_lang, - one_lang, - Ops.get_string(known_languages, [one_lang, 4], "") - ) - # xx only without _YY - else - found = false - Builtins.foreach(known_languages) do |lang_short, lang_params| - if Builtins.regexpmatch( - lang_short, - Builtins.sformat("%1_.*", one_lang) - ) - Ops.set( - short_to_lang, - one_lang, - Builtins.tostring(Ops.get_string(lang_params, 4, "")) - ) - found = true - raise Break - end - end - if !found - Builtins.y2warning("Couldn't find language for '%1'", one_lang) - # TRANSLATORS: multiselection box item, %1 stands for 'ar', 'mk', 'zh_TW' - # it used only as a fallback - Ops.set( - short_to_lang, - one_lang, - Builtins.sformat(_("Language %1"), one_lang) - ) - end - end - end - - Builtins.y2milestone("%1", short_to_lang) - selected_languages = ( - short_to_lang_ref = arg_ref(short_to_lang); - already_installed_languages_ref = arg_ref( - already_installed_languages.value - ); - _Dialog_SelectLanguagesUI_result = Dialog_SelectLanguagesUI( - short_to_lang_ref, - already_installed_languages_ref - ); - short_to_lang = short_to_lang_ref.value; - already_installed_languages.value = already_installed_languages_ref.value( - ); - _Dialog_SelectLanguagesUI_result - ) - - return deep_copy(selected_languages) - end - end - - # Dialog definitions <-- - - def MainFunction - Dialog_Init() - - # This call can be removed - InitFunction() - - # Finding out the source, can be also used AddOnProduct::src_id - # but this is better for testing - all_sources = Pkg.SourceGetCurrent(true) - all_sources = Builtins.sort(all_sources) { |x, y| Ops.less_than(x, y) } - source = Ops.get( - all_sources, - Ops.subtract(Builtins.size(all_sources), 1), - -1 - ) - Pkg.SourceSetEnabled(source, true) - - # one language -> preselect it and install - # more languages -> let user decides - available_languages = GetListOfSupportedLanguages(source) - if available_languages == nil || available_languages == [] - Builtins.y2error("No languages available!") - return 10 - end - - # bugzilla #217052 - # some languages should be pre-selected (already installed, at least partly) - installed_languages = Pkg.ResolvableProperties("", :language, "") - already_installed_languages = [] - Builtins.foreach(installed_languages) do |language| - if Ops.get(language, "status") == :installed - if Ops.get(language, "name") != nil - already_installed_languages = Builtins.add( - already_installed_languages, - Ops.get_string(language, "name", "") - ) - else - Builtins.y2error("Language %1 has no 'name'", language) - end - end - end - - Builtins.y2milestone( - "Already installed languages: %1", - already_installed_languages - ) - selected_languages = ( - already_installed_languages_ref = arg_ref(already_installed_languages); - _Dialog_SelectLanguages_result = Dialog_SelectLanguages( - available_languages, - already_installed_languages_ref - ); - already_installed_languages = already_installed_languages_ref.value; - _Dialog_SelectLanguages_result - ) - if selected_languages == nil || selected_languages == [] - Builtins.y2warning("User did not select any language, finishing...") - return 15 - end - - if Install(selected_languages) != true - Builtins.y2error("Error occured during installation") - return 20 - end - - 0 - end - end -end - -Yast::InstLanguageAddOnClient.new.main

1 0

commit 000product for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '17

01 Aug '17

Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2017-08-01 09:26:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Tue Aug 1 09:26:03 2017 rev:37 rq: version:unknown Tue Aug 1 09:26:03 2017 rev:38 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ _service:product_converter:openSUSE-Addon-Lang-cd-cd-x86_64.kiwi: same change _service:product_converter:openSUSE-Addon-Lang-release.spec: same change _service:product_converter:openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi: same change _service:product_converter:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi: same change _service:product_converter:openSUSE-Addon-NonOss-release.spec: same change ++++++ _service:product_converter:openSUSE-Kubic-dvd5-DVD-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.VUf6ww/_old 2017-08-01 09:26:16.784083252 +0200 +++ /var/tmp/diff_new_pack.VUf6ww/_new 2017-08-01 09:26:16.796081561 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE-Kubic___20170730" schemaversion="4.1"> +<image name="OBS__openSUSE-Kubic___20170801" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -34,9 +34,9 @@ <productvar name="RUN_ISOHYBRID">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20170730</productvar> + <productvar name="VERSION">20170801</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-kubic:20170730,openSUSE Kubic</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-kubic:20170801,openSUSE Kubic</productinfo> <productinfo name="LINGUAS">en_US </productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> ++++++ _service:product_converter:openSUSE-Kubic-release.spec ++++++ --- /var/tmp/diff_new_pack.VUf6ww/_old 2017-08-01 09:26:16.848074234 +0200 +++ /var/tmp/diff_new_pack.VUf6ww/_new 2017-08-01 09:26:16.856073106 +0200 @@ -20,7 +20,7 @@ Summary: openSUSE Kubic License: GPL-2.0+ Group: System/Fhs -Version: 20170730 +Version: 20170801 Release: 0 BuildRequires: skelcd-openSUSE Recommends: branding @@ -31,9 +31,9 @@ Provides: %name-%version Provides: product() = openSUSE-Kubic -Provides: product(openSUSE-Kubic) = 20170730-0 +Provides: product(openSUSE-Kubic) = 20170801-0 Provides: product-label() = openSUSE%20Kubic -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dkubic%3A20170730 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dkubic%3A20170801 Provides: product-url(releasenotes) = https%3A%2F%2Fwww.suse.com%2Freleasenotes%2F%{_target_cpu}%2FSUSE%2DCAASP%2F1.0%2Frelease%2Dnotes%2Dcaasp.rpm Provides: product-endoflife() @@ -90,7 +90,7 @@ PRETTY_NAME="openSUSE Kubic" ID="opensuse-kubic" ANSI_COLOR="0;32" -CPE_NAME="cpe:/o:opensuse:opensuse-kubic:20170730" +CPE_NAME="cpe:/o:opensuse:opensuse-kubic:20170801" EOF @@ -100,11 +100,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE-Kubic</name> - <version>20170730</version> + <version>20170801</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse-kubic:20170730</cpeid> + <cpeid>cpe:/o:opensuse:opensuse-kubic:20170801</cpeid> <productline>openSUSE-Kubic</productline> <register> <target/> ++++++ _service:product_converter:openSUSE-cd-mini-i586.kiwi ++++++ --- /var/tmp/diff_new_pack.VUf6ww/_old 2017-08-01 09:26:16.900066906 +0200 +++ /var/tmp/diff_new_pack.VUf6ww/_new 2017-08-01 09:26:16.900066906 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20170730" schemaversion="4.1"> +<image name="OBS__openSUSE___20170801" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -31,9 +31,9 @@ <productvar name="RUN_ISOHYBRID">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20170730</productvar> + <productvar name="VERSION">20170801</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20170730,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20170801,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> _service:product_converter:openSUSE-cd-mini-x86_64.kiwi: same change _service:product_converter:openSUSE-dvd5-dvd-i586.kiwi: same change ++++++ _service:product_converter:openSUSE-dvd5-dvd-promo-i586.kiwi ++++++ --- /var/tmp/diff_new_pack.VUf6ww/_old 2017-08-01 09:26:17.000052814 +0200 +++ /var/tmp/diff_new_pack.VUf6ww/_new 2017-08-01 09:26:17.000052814 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20170730" schemaversion="4.1"> +<image name="OBS__openSUSE___20170801" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -32,9 +32,9 @@ <productvar name="RUN_MEDIA_CHECK">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20170730</productvar> + <productvar name="VERSION">20170801</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20170730,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20170801,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> _service:product_converter:openSUSE-dvd5-dvd-promo-x86_64.kiwi: same change ++++++ _service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.VUf6ww/_old 2017-08-01 09:26:17.088040414 +0200 +++ /var/tmp/diff_new_pack.VUf6ww/_new 2017-08-01 09:26:17.092039850 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20170730" schemaversion="4.1"> +<image name="OBS__openSUSE___20170801" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -34,9 +34,9 @@ <productvar name="RUN_ISOHYBRID">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20170730</productvar> + <productvar name="VERSION">20170801</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20170730,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20170801,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> ++++++ _service:product_converter:openSUSE-dvd9-dvd-biarch-i586_x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.VUf6ww/_old 2017-08-01 09:26:17.140033086 +0200 +++ /var/tmp/diff_new_pack.VUf6ww/_new 2017-08-01 09:26:17.140033086 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20170730" schemaversion="4.1"> +<image name="OBS__openSUSE___20170801" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -36,9 +36,9 @@ <productvar name="RUN_MEDIA_CHECK">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20170730</productvar> + <productvar name="VERSION">20170801</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20170730,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20170801,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> ++++++ _service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.VUf6ww/_old 2017-08-01 09:26:17.176028014 +0200 +++ /var/tmp/diff_new_pack.VUf6ww/_new 2017-08-01 09:26:17.176028014 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20170730" schemaversion="4.1"> +<image name="OBS__openSUSE___20170801" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -23,7 +23,7 @@ <productoptions> <productvar name="DISTNAME">openSUSE</productvar> <productvar name="FLAVOR">ftp</productvar> - <productvar name="MEDIUM_NAME">openSUSE-20170730-i586-x86_64</productvar> + <productvar name="MEDIUM_NAME">openSUSE-20170801-i586-x86_64</productvar> <productvar name="MULTIPLE_MEDIA">true</productvar> <productvar name="PRODUCT_DIR">/</productvar> <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar> @@ -34,9 +34,9 @@ <productvar name="REPO_ONLY">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20170730</productvar> + <productvar name="VERSION">20170801</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20170730,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20170801,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="DEBUGMEDIUM">2</productoption> ++++++ _service:product_converter:openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.VUf6ww/_old 2017-08-01 09:26:17.212022941 +0200 +++ /var/tmp/diff_new_pack.VUf6ww/_new 2017-08-01 09:26:17.224021250 +0200 @@ -18,7 +18,7 @@ Name: openSUSE-release %define product openSUSE -Version: 20170730 +Version: 20170801 Release: 0 # 0 is the product release, not the build release of this package Provides: aaa_version @@ -28,7 +28,7 @@ Obsoletes: aaa_version Obsoletes: openSUSE-Promo-release <= 11.1 Obsoletes: openSUSE-release-live <= 11.0 -Obsoletes: product_flavor(%{product}) < 20170730 +Obsoletes: product_flavor(%{product}) < 20170801 Conflicts: sles-release <= 10 sled-release <= 10 core-release <= 10 # bnc#826592 Provides: weakremover(kernel-default) < 3.11 @@ -46,7 +46,7 @@ BuildRequires: skelcd-openSUSE Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20170730-0 +Provides: product(openSUSE) = 20170801-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -60,7 +60,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 %endif Provides: product-label() = openSUSE -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20170730 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20170801 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F @@ -8109,10 +8109,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20170730</version> + <version>20170801</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse:20170730</cpeid> + <cpeid>cpe:/o:opensuse:opensuse:20170801</cpeid> <productline>openSUSE</productline> <register> %ifarch x86_64 openSUSE-release.spec: same change ++++++ openSUSE-Kubic.product ++++++ --- /var/tmp/diff_new_pack.VUf6ww/_old 2017-08-01 09:26:17.635963192 +0200 +++ /var/tmp/diff_new_pack.VUf6ww/_new 2017-08-01 09:26:17.639962629 +0200 @@ -6,7 +6,7 @@ <name>openSUSE-Kubic</name> <releasepkgname>openSUSE-Kubic-release</releasepkgname> <endoflife/> - <version>20170730</version> + <version>20170801</version>  <release>0</release> <productline>openSUSE-Kubic</productline> ++++++ openSUSE.product ++++++ --- /var/tmp/diff_new_pack.VUf6ww/_old 2017-08-01 09:26:17.679956992 +0200 +++ /var/tmp/diff_new_pack.VUf6ww/_new 2017-08-01 09:26:17.683956428 +0200 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20170730</version> + <version>20170801</version> <release>0</release> <productline>openSUSE</productline>

1 0