December 2018 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-country for openSUSE:Factory
by root 31 Dec '18

31 Dec '18

Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2018-12-31 09:44:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-country" Mon Dec 31 09:44:33 2018 rev:198 rq:659341 version:4.1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2018-11-22 13:24:20.342074196 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-country.new.28833/yast2-country.changes 2018-12-31 09:44:34.778305531 +0100 @@ -1,0 +2,15 @@ +Tue Dec 18 14:29:34 UTC 2018 - jreidinger(a)suse.com + +- always use absolute path to binaries (bsc#1118291) +- properly escape shell arguments (bsc#1118291) +- drop policy kit definitions as yast2-dbus-server is already + dropped +- 4.1.7 + +------------------------------------------------------------------- +Sat Nov 24 16:24:01 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org> + +- Provide icon with module (boo#1109310) +- 4.1.6 + +------------------------------------------------------------------- Old: ---- org.opensuse.yast.modules.yapi.language.policy org.opensuse.yast.modules.yapi.time.policy yast2-country-4.1.5.tar.bz2 New: ---- yast2-country-4.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.DPIiVo/_old 2018-12-31 09:44:35.158305220 +0100 +++ /var/tmp/diff_new_pack.DPIiVo/_new 2018-12-31 09:44:35.162305217 +0100 @@ -17,17 +17,13 @@ Name: yast2-country -Version: 4.1.5 +Version: 4.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -#policy files for YaPI dbus interface -Source1: org.opensuse.yast.modules.yapi.time.policy -Source2: org.opensuse.yast.modules.yapi.language.policy BuildRequires: perl-XML-Writer -BuildRequires: polkit-devel BuildRequires: update-desktop-files BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-perl-bindings @@ -85,8 +81,6 @@ # Policies mkdir -p $RPM_BUILD_ROOT/usr/share/polkit-1/actions -install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/ -install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/ # common %files @@ -110,12 +104,10 @@ %{yast_schemadir}/autoyast/rnc/*.rnc %{yast_desktopdir}/yast-language.desktop %{yast_desktopdir}/timezone.desktop +%{yast_icondir} %ifnarch s390 s390x %{yast_desktopdir}/keyboard.desktop %endif -%dir /usr/share/polkit-1 -%dir /usr/share/polkit-1/actions -%attr(644,root,root) %config /usr/share/polkit-1/actions/org.opensuse.yast.modules.yapi.*.policy %package data Requires: yast2-ruby-bindings >= 1.0.0 ++++++ yast2-country-4.1.5.tar.bz2 -> yast2-country-4.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/console/src/modules/Console.rb new/yast2-country-4.1.7/console/src/modules/Console.rb --- old/yast2-country-4.1.5/console/src/modules/Console.rb 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/console/src/modules/Console.rb 2018-12-18 16:27:38.000000000 +0100 @@ -157,7 +157,7 @@ # upgrade: disable old entries for serial console SCR.Execute( path(".target.bash"), - "sed -i '/^\$hvc\\|hvsi\\|S[0-9]\$/s@^.*@#&@' /etc/inittab" + "/usr/bin/sed -i '/^\$hvc\\|hvsi\\|S[0-9]\$/s@^.*@#&@' /etc/inittab" ) # find out if the baud rate is not present on command line (bnc#602743) @@ -173,13 +173,13 @@ SCR.Execute( path(".target.bash"), Builtins.sformat( - "grep -E '^cons:' /etc/inittab || /bin/echo 'cons:12345:respawn:/sbin/smart_agetty -L %1 console' >> /etc/inittab", + "/usr/bin/grep -E '^cons:' /etc/inittab || /usr/bin/echo 'cons:12345:respawn:/sbin/smart_agetty -L %1 console' >> /etc/inittab", rate ) ) SCR.Execute( path(".target.bash"), - "grep -Ew ^console /etc/securetty || /bin/echo console >> /etc/securetty" + "/usr/bin/grep -Ew ^console /etc/securetty || /usr/bin/echo console >> /etc/securetty" ) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/keyboard/src/Makefile.am new/yast2-country-4.1.7/keyboard/src/Makefile.am --- old/yast2-country-4.1.5/keyboard/src/Makefile.am 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/keyboard/src/Makefile.am 2018-12-18 16:27:38.000000000 +0100 @@ -34,7 +34,14 @@ ywidgets_DATA = \ lib/y2country/widgets/keyboard_selection.rb +symbolicdir = @icondir@/hicolor/symbolic/apps +symbolic_DATA = \ + icons/hicolor/symbolic/apps/yast-keyboard-symbolic.svg +scalabledir = @icondir@/hicolor/scalable/apps +scalable_DATA = \ + icons/hicolor/scalable/apps/yast-keyboard.svg + EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) \ - $(schemafiles_DATA) $(ydata_DATA) $(desktop_DATA) $(ywidgets_DATA) + $(schemafiles_DATA) $(ydata_DATA) $(desktop_DATA) $(ywidgets_DATA) $(symbolic_DATA) $(scalable_DATA) include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/keyboard/src/icons/hicolor/scalable/apps/yast-keyboard.svg new/yast2-country-4.1.7/keyboard/src/icons/hicolor/scalable/apps/yast-keyboard.svg --- old/yast2-country-4.1.5/keyboard/src/icons/hicolor/scalable/apps/yast-keyboard.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-4.1.7/keyboard/src/icons/hicolor/scalable/apps/yast-keyboard.svg 2018-12-18 16:27:38.000000000 +0100 @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg version="1.1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> +<defs> +<linearGradient id="c" x1="2" x2="62" y1="17" y2="17" gradientTransform="translate(0,-2)" gradientUnits="userSpaceOnUse"> +<stop stop-color="#9a9996" offset="0"/> +<stop stop-color="#deddda" offset=".033333"/> +<stop stop-color="#9a9996" offset=".066667"/> +<stop stop-color="#9a9996" offset=".93333"/> +<stop stop-color="#deddda" offset=".96667"/> +<stop stop-color="#9a9996" offset="1"/> +</linearGradient> +<linearGradient id="b" x1="4" x2="60" y1="14" y2="14" gradientUnits="userSpaceOnUse"> +<stop stop-color="#deddda" offset="0"/> +<stop stop-color="#c0bfbc" offset="1"/> +</linearGradient> +</defs> +<g transform="matrix(2,0,0,2,0,34)"> +<rect x="2" y="-1" width="60" height="34" ry="4" fill="url(#c)"/> +<rect x="2" y="-3" width="60" height="34" ry="4" fill="url(#b)"/> +<rect x="6" y="-1" width="4" height="5" ry="1"/> +<rect x="6" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="6" y="8" width="6" height="4" ry="1"/> +<rect x="6" y="7" width="6" height="4" ry="1" fill="#241f31"/> +<rect x="6" y="16" width="8" height="4" ry="1"/> +<rect x="6" y="15" width="8" height="4" ry="1" fill="#241f31"/> +<rect x="6" y="24" width="4" height="4" ry="1"/> +<rect x="6" y="23" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="12" y="24" width="4" height="4" ry="1"/> +<rect x="12" y="23" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="18" y="24" width="28" height="4" ry="1"/> +<rect x="18" y="23" width="28" height="4" ry="1" fill="#241f31"/> +<rect x="48" y="24" width="4" height="4" ry="1"/> +<rect x="48" y="23" width="4" height="4" ry="1.0243" fill="#241f31"/> +<rect x="54" y="24" width="4" height="4" ry="1"/> +<rect x="54" y="23" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="14" y="8" width="4" height="4" ry="1"/> +<rect x="14" y="7" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="20" y="8" width="4" height="4" ry="1"/> +<rect x="20" y="7" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="26" y="8" width="4" height="4" ry="1"/> +<rect x="26" y="7" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="32" y="8" width="4" height="4" ry="1"/> +<rect x="32" y="7" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="38" y="8" width="4" height="4" ry="1"/> +<rect x="38" y="7" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="44" y="8" width="4" height="4" ry="1"/> +<rect x="44" y="7" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="16" y="16" width="4" height="4" ry="1"/> +<rect x="16" y="15" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="22" y="16" width="4" height="4" ry="1"/> +<rect x="22" y="15" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="28" y="16" width="4" height="4" ry="1"/> +<rect x="28" y="15" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="34" y="16" width="4" height="4" ry="1"/> +<rect x="34" y="15" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="40" y="16" width="4" height="4" ry="1"/> +<rect x="40" y="15" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="46" y="16" width="4" height="4" ry="1"/> +<rect x="46" y="15" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="50" y="8" width="8" height="4" ry="1"/> +<rect x="50" y="7" width="8" height="4" ry="1" fill="#241f31"/> +<rect x="52" y="16" width="6" height="4" ry="1"/> +<rect x="52" y="15" width="6" height="4" ry="1" fill="#241f31"/> +<rect x="12" y="-1" width="4" height="5" ry="1"/> +<rect x="12" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="18" y="-1" width="4" height="5" ry="1"/> +<rect x="18" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="24" y="-1" width="4" height="5" ry="1"/> +<rect x="24" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="30" y="-1" width="4" height="5" ry="1"/> +<rect x="30" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="36" y="-1" width="4" height="5" ry="1"/> +<rect x="36" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="42" y="-1" width="4" height="5" ry="1"/> +<rect x="42" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="48" y="-1" width="4" height="5" ry="1"/> +<rect x="48" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="54" y="-1" width="4" height="5" ry="1"/> +<rect x="54" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +</g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/keyboard/src/icons/hicolor/symbolic/apps/yast-keyboard-symbolic.svg new/yast2-country-4.1.7/keyboard/src/icons/hicolor/symbolic/apps/yast-keyboard-symbolic.svg --- old/yast2-country-4.1.5/keyboard/src/icons/hicolor/symbolic/apps/yast-keyboard-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-4.1.7/keyboard/src/icons/hicolor/symbolic/apps/yast-keyboard-symbolic.svg 2018-12-18 16:27:38.000000000 +0100 @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + id="svg4" + version="1.1" + height="16" + width="16"> + <metadata + id="metadata10"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs8" /> + <path + id="path2" + d="M 1 2 C 0.446 2 0 2.446 0 3 L 0 12 C 0 12.554 0.446 13 1 13 L 10 13 L 10 11 L 4 11 L 4 10 L 10 10 L 12 10 L 13 10 L 14 10 L 16 10 L 16 3 C 16 2.446 15.554 2 15 2 L 1 2 z M 2 4 L 4 4 L 4 5 L 2 5 L 2 4 z M 5 4 L 6 4 L 6 5 L 5 5 L 5 4 z M 7 4 L 8 4 L 8 5 L 7 5 L 7 4 z M 9 4 L 10 4 L 10 5 L 9 5 L 9 4 z M 11 4 L 12 4 L 12 5 L 11 5 L 11 4 z M 13 4 L 14 4 L 14 5 L 13 5 L 13 4 z M 2 6 L 3 6 L 3 7 L 2 7 L 2 6 z M 4 6 L 5 6 L 5 7 L 4 7 L 4 6 z M 6 6 L 7 6 L 7 7 L 6 7 L 6 6 z M 8 6 L 9 6 L 9 7 L 8 7 L 8 6 z M 10 6 L 11 6 L 11 7 L 10 7 L 10 6 z M 12 6 L 14 6 L 14 7 L 12 7 L 12 6 z M 2 8 L 4 8 L 4 9 L 2 9 L 2 8 z M 5 8 L 6 8 L 6 9 L 5 9 L 5 8 z M 7 8 L 8 8 L 8 9 L 7 9 L 7 8 z M 9 8 L 10 8 L 10 9 L 9 9 L 9 8 z M 11 8 L 14 8 L 14 9 L 11 9 L 11 8 z M 2 10 L 3 10 L 3 11 L 2 11 L 2 10 z M 11 11 L 11 16 L 16 16 L 16 11 L 11 11 z M 12 12 L 13 12 L 13 13 L 14 13 L 14 12 L 15 12 L 15 14 L 14 14 L 14 15 L 13 15 L 13 14 L 12 14 L 12 12 z " + style="fill:#c0bfbc" /> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/keyboard/src/modules/Keyboard.rb new/yast2-country-4.1.7/keyboard/src/modules/Keyboard.rb --- old/yast2-country-4.1.5/keyboard/src/modules/Keyboard.rb 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/keyboard/src/modules/Keyboard.rb 2018-12-18 16:27:38.000000000 +0100 @@ -90,6 +90,8 @@ # require "yast" +require "shellwords" + module Yast class KeyboardClass < Module include Yast::Logger @@ -378,9 +380,8 @@ x11data = {} if Ops.greater_than(SCR.Read(path(".target.size"), cmd), 0) - file = Ops.add(Directory.tmpdir, "/xkbctrl.out") - cmd = Ops.add(Ops.add(cmd, " "), keymap) - SCR.Execute(path(".target.bash"), Ops.add(Ops.add(cmd, " > "), file)) + file = File.join(Directory.tmpdir, "xkbctrl.out") + SCR.Execute(path(".target.bash"), "#{cmd} #{keymap.shellescape} > #{file.shellescape}") x11data = Convert.to_map(SCR.Read(path(".target.ycp"), file)) else Builtins.y2warning("/usr/sbin/xkbctrl not found") @@ -551,12 +552,14 @@ return false # Error end - @ckb_cmd = "/bin/loadkeys #{loadkeys_devices} #{keymap}" + # loadkeys is already escaped and it is multiple params inside, so cannot be escaped here + @ckb_cmd = "/usr/bin/loadkeys #{loadkeys_devices} #{keymap.shellescape}" # X11 command... # do not try to run this with remote X display if Ops.greater_than(Builtins.size(@Apply), 0) && x11_setup_needed - @xkb_cmd = Ops.add(Ops.add(XVersion.binPath, "/setxkbmap "), @Apply) + # Apply cannot be escaped as it is already set of parameters. But it is at least our string and not user provided. + @xkb_cmd = "#{File.join(XVersion.binPath, "setxkbmap")} #{@Apply}" else @xkb_cmd = "" end @@ -865,11 +868,11 @@ if Stage.initial # do use --root option, running in chroot does not work (bsc#1074481) - cmd = "/usr/bin/systemd-firstboot --root '#{Installation.destdir}' --keymap '#{chomped_keymap}'" + cmd = "/usr/bin/systemd-firstboot --root #{Installation.destdir.shellescape} --keymap #{chomped_keymap.shellescape}" result = WFM.Execute(path(".local.bash_output"), cmd) else # this sets both the console and the X11 keyboard (see "man localectl") - cmd = "/usr/bin/localectl set-keymap #{chomped_keymap}" + cmd = "/usr/bin/localectl set-keymap #{chomped_keymap.shellescape}" result = SCR.Execute(path(".target.bash_output"), cmd) end @@ -1406,7 +1409,7 @@ # Enables autorepeat if needed def enable_autorepeat return nil unless Stage.initial && !Mode.live_installation && !xen_running - cmd = "xset r on" + cmd = "/usr/bin/xset r on" log.info "calling xset to fix autorepeat problem: #{cmd}" SCR.Execute(path(".target.bash"), cmd) end @@ -1454,7 +1457,7 @@ # @return [String] ready to be passed to the loadkeys command def loadkeys_devices tty_dev_names = Dir["/dev/tty*"].grep_v(/ttyAMA/) - tty_dev_names.map { |d| "-C #{d}" }.join(" ") + tty_dev_names.map { |d| "-C #{d.shellescape}" }.join(" ") end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/keyboard/test/keyboard_test.rb new/yast2-country-4.1.7/keyboard/test/keyboard_test.rb --- old/yast2-country-4.1.5/keyboard/test/keyboard_test.rb 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/keyboard/test/keyboard_test.rb 2018-12-18 16:27:38.000000000 +0100 @@ -77,7 +77,7 @@ it "writes the configuration" do expect(WFM).to receive(:Execute).with(path(".local.bash_output"), - "/usr/bin/systemd-firstboot --root '/mnt' --keymap 'es'").and_return("exit" => 0) + "/usr/bin/systemd-firstboot --root /mnt --keymap es").and_return("exit" => 0) expect(AsciiFile).to receive(:AppendLine).with(anything, ["Keytable:", "es.map.gz"]) Keyboard.Set("spanish") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/language/src/Makefile.am new/yast2-country-4.1.7/language/src/Makefile.am --- old/yast2-country-4.1.5/language/src/Makefile.am 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/language/src/Makefile.am 2018-12-18 16:27:38.000000000 +0100 @@ -96,6 +96,13 @@ desktop_DATA = \ desktop/yast-language.desktop -EXTRA_DIST = $(module_DATA) $(module1_DATA) $(client_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(ydata_DATA) $(desktop_DATA) $(ylib_DATA) $(ywidgets_DATA) +symbolicdir = @icondir@/hicolor/symbolic/apps +symbolic_DATA = \ + icons/hicolor/symbolic/apps/yast-language-symbolic.svg +scalabledir = @icondir@/hicolor/scalable/apps +scalable_DATA = \ + icons/hicolor/scalable/apps/yast-language.svg + +EXTRA_DIST = $(module_DATA) $(module1_DATA) $(client_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(ydata_DATA) $(desktop_DATA) $(ylib_DATA) $(ywidgets_DATA) $(symbolic_DATA) $(scalable_DATA) include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/language/src/icons/hicolor/scalable/apps/yast-language.svg new/yast2-country-4.1.7/language/src/icons/hicolor/scalable/apps/yast-language.svg --- old/yast2-country-4.1.5/language/src/icons/hicolor/scalable/apps/yast-language.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-4.1.7/language/src/icons/hicolor/scalable/apps/yast-language.svg 2018-12-18 16:27:38.000000000 +0100 @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg version="1.1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"> +<g transform="matrix(2,0,0,2,-2,32)"> +<rect x="7" y="-9" width="34" height="49" ry="2" fill="#c0bfbc"/> +<rect x="7" y="-10" width="34" height="48" ry="2" fill="#f6f5f4"/> +<path d="m15 4h16v4l-6 8 8 4v4l-10-6-6 6h-2v-2l14-16h-8l-2 2-4-2z" fill="#c0bfbc"/> +<path d="m15 6h16v4l-6 8 8 4v4l-10-6-6 6-2-2 14-16h-8l-2 2z" fill="#333"/> +<path d="m27 0v2h-6l-2-2v-2z" fill="#c0bfbc"/> +<path d="m27 2v2h-6l-2-4z" fill="#333"/> +<rect x="25" y="-6" width="34" height="48" ry="2" fill="#1a5fb4"/> +<rect x="25" y="-8" width="34" height="48" ry="2" fill="#3584e4"/> +<path d="m39 4-8 24 5.1016-1 1.8984-5h8l1.8984 5 5.1016 1-8-24zm2 8h2l2 4h-6z" fill="#1a5fb4"/> +<path d="m39 6-8 22h6l2-6h6l2 6h6l-8-22zm2 6h2l2 6h-6z" fill="#fff"/> +</g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/language/src/icons/hicolor/symbolic/apps/yast-language-symbolic.svg new/yast2-country-4.1.7/language/src/icons/hicolor/symbolic/apps/yast-language-symbolic.svg --- old/yast2-country-4.1.5/language/src/icons/hicolor/symbolic/apps/yast-language-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-4.1.7/language/src/icons/hicolor/symbolic/apps/yast-language-symbolic.svg 2018-12-18 16:27:38.000000000 +0100 @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"> + <path d="M 5 0 C 4.446 0 4 0.446 4 1 L 4 12 C 4 12.554 4.446 13 5 13 L 10 13 L 10 10 L 12.457031 10 L 11.384766 7.5 L 8.6152344 7.5 L 7.4589844 10.197266 L 6.5410156 9.8027344 L 10 1.7304688 L 13.458984 9.8027344 L 13 10 L 16 10 L 16 1 C 16 0.446 15.554 0 15 0 L 5 0 z M 1 3 C 0.446 3 0 3.446 0 4 L 0 15 C 0 15.554 0.446 16 1 16 L 10 16 L 10 14 L 3 14 L 2 14 L 2 5 L 3 5 L 3 3 L 1 3 z M 10 4.2675781 L 9.0429688 6.5 L 10.957031 6.5 L 10 4.2675781 z M 11 11 L 11 16 L 16 16 L 16 11 L 11 11 z M 12 12 L 13 12 L 13 13 L 14 13 L 14 12 L 15 12 L 15 14 L 14 14 L 14 15 L 13 15 L 13 14 L 12 14 L 12 12 z " fill="#c0bfbc" /> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/language/src/modules/Language.rb new/yast2-country-4.1.7/language/src/modules/Language.rb --- old/yast2-country-4.1.5/language/src/modules/Language.rb 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/language/src/modules/Language.rb 2018-12-18 16:27:38.000000000 +0100 @@ -29,6 +29,8 @@ # $Id$ require "yast" +require "shellwords" + module Yast class LanguageClass < Module DEFAULT_FALLBACK_LANGUAGE = "en_US".freeze @@ -293,9 +295,7 @@ # return the map of all supported countries and language codes def GetLocales if @locales == nil || @locales == {} - out = Convert.to_map( - SCR.Execute(path(".target.bash_output"), "/usr/bin/locale -a") - ) + out = SCR.Execute(path(".target.bash_output"), "/usr/bin/locale -a") Builtins.foreach( Builtins.splitstring(Ops.get_string(out, "stdout", ""), "\n") ) do |l| @@ -941,10 +941,10 @@ cmd = if Stage.initial # do use --root option, running in chroot does not work - "/usr/bin/systemd-firstboot --root '#{Installation.destdir}' --locale '#{loc}'" + "/usr/bin/systemd-firstboot --root #{Installation.destdir.shellescape} --locale #{loc.shellescape}" else # this sets both the locale (see "man localectl") - "/usr/bin/localectl set-locale #{locale_out}" + "/usr/bin/localectl set-locale #{locale_out.shellescape}" end log.info "Making language setting persistent: #{cmd}" result = if Stage.initial diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/language/testsuite/tests/Save.out new/yast2-country-4.1.7/language/testsuite/tests/Save.out --- old/yast2-country-4.1.5/language/testsuite/tests/Save.out 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/language/testsuite/tests/Save.out 2018-12-18 16:27:38.000000000 +0100 @@ -2,5 +2,5 @@ Read .target.dir "/usr/share/YaST2/data/languages" [] Write .sysconfig.language.INSTALLED_LANGUAGES "en_US" true Write .sysconfig.language nil true -Execute .target.bash_output "/usr/bin/localectl set-locale LANG=en_US.UTF-8" $["exit":0] +Execute .target.bash_output "/usr/bin/localectl set-locale LANG\\=en_US.UTF-8" $["exit":0] Return nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/package/org.opensuse.yast.modules.yapi.language.policy new/yast2-country-4.1.7/package/org.opensuse.yast.modules.yapi.language.policy --- old/yast2-country-4.1.5/package/org.opensuse.yast.modules.yapi.language.policy 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/package/org.opensuse.yast.modules.yapi.language.policy 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE policyconfig PUBLIC - "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" - "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd"> -<policyconfig> - - <vendor>YaST Webservice Project</vendor> - <vendor_url>http://en.opensuse.org/Portal:YaST</vendor_url> - - - - <action id="org.opensuse.yast.modules.yapi.language.read"> - <description>Reading languages settings</description> - <message>Authentication is required to read languages settings</message> - <defaults> - <allow_inactive>no</allow_inactive> - <allow_active>no</allow_active> - </defaults> - </action> - <action id="org.opensuse.yast.modules.yapi.language.write"> - <description>Writing new language settings</description> - <message>Authentication is required to edit language settings</message> - <defaults> - <allow_inactive>no</allow_inactive> - <allow_active>no</allow_active> - </defaults> - </action> - -</policyconfig> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/package/org.opensuse.yast.modules.yapi.time.policy new/yast2-country-4.1.7/package/org.opensuse.yast.modules.yapi.time.policy --- old/yast2-country-4.1.5/package/org.opensuse.yast.modules.yapi.time.policy 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/package/org.opensuse.yast.modules.yapi.time.policy 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE policyconfig PUBLIC - "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" - "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd"> -<policyconfig> - - <vendor>YaST Webservice Project</vendor> - <vendor_url>http://en.opensuse.org/Portal:YaST</vendor_url> - - - - <action id="org.opensuse.yast.modules.yapi.time.read"> - <description>Reading system time settings</description> - <message>Authentication is required to read system time settings</message> - <defaults> - <allow_inactive>no</allow_inactive> - <allow_active>no</allow_active> - </defaults> - </action> - <action id="org.opensuse.yast.modules.yapi.time.write"> - <description>Writing system time settings</description> - <message>Authentication is required to read system time settings</message> - <defaults> - <allow_inactive>no</allow_inactive> - <allow_active>no</allow_active> - </defaults> - </action> - -</policyconfig> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/package/yast2-country.changes new/yast2-country-4.1.7/package/yast2-country.changes --- old/yast2-country-4.1.5/package/yast2-country.changes 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/package/yast2-country.changes 2018-12-18 16:27:38.000000000 +0100 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Tue Dec 18 14:29:34 UTC 2018 - jreidinger(a)suse.com + +- always use absolute path to binaries (bsc#1118291) +- properly escape shell arguments (bsc#1118291) +- drop policy kit definitions as yast2-dbus-server is already + dropped +- 4.1.7 + +------------------------------------------------------------------- +Sat Nov 24 16:24:01 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org> + +- Provide icon with module (boo#1109310) +- 4.1.6 + +------------------------------------------------------------------- Tue Nov 20 09:25:14 UTC 2018 - knut.anderssen(a)suse.com - Aligned "Synchronize Now" button and "NTP Server Address" box not diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/package/yast2-country.spec new/yast2-country-4.1.7/package/yast2-country.spec --- old/yast2-country-4.1.5/package/yast2-country.spec 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/package/yast2-country.spec 2018-12-18 16:27:38.000000000 +0100 @@ -17,17 +17,13 @@ Name: yast2-country -Version: 4.1.5 +Version: 4.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -#policy files for YaPI dbus interface -Source1: org.opensuse.yast.modules.yapi.time.policy -Source2: org.opensuse.yast.modules.yapi.language.policy BuildRequires: perl-XML-Writer -BuildRequires: polkit-devel BuildRequires: update-desktop-files BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-perl-bindings @@ -85,8 +81,6 @@ # Policies mkdir -p $RPM_BUILD_ROOT/usr/share/polkit-1/actions -install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/ -install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/ # common %files @@ -110,12 +104,10 @@ %{yast_schemadir}/autoyast/rnc/*.rnc %{yast_desktopdir}/yast-language.desktop %{yast_desktopdir}/timezone.desktop +%{yast_icondir} %ifnarch s390 s390x %{yast_desktopdir}/keyboard.desktop %endif -%dir /usr/share/polkit-1 -%dir /usr/share/polkit-1/actions -%attr(644,root,root) %config /usr/share/polkit-1/actions/org.opensuse.yast.modules.yapi.*.policy %package data Requires: yast2-ruby-bindings >= 1.0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/timezone/src/Makefile.am new/yast2-country-4.1.7/timezone/src/Makefile.am --- old/yast2-country-4.1.5/timezone/src/Makefile.am 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/timezone/src/Makefile.am 2018-12-18 16:27:38.000000000 +0100 @@ -32,6 +32,13 @@ desktop_DATA = \ desktop/timezone.desktop -EXTRA_DIST = $(module_DATA) $(module1_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(ydata_DATA) $(desktop_DATA) +symbolicdir = @icondir@/hicolor/symbolic/apps +symbolic_DATA = \ + icons/hicolor/symbolic/apps/yast-timezone-symbolic.svg +scalabledir = @icondir@/hicolor/scalable/apps +scalable_DATA = \ + icons/hicolor/scalable/apps/yast-timezone.svg -include $(top_srcdir)/Makefile.am.common \ No newline at end of file +EXTRA_DIST = $(module_DATA) $(module1_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(ydata_DATA) $(desktop_DATA) $(symbolic_DATA) $(scalable_DATA) + +include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/timezone/src/icons/hicolor/scalable/apps/yast-timezone.svg new/yast2-country-4.1.7/timezone/src/icons/hicolor/scalable/apps/yast-timezone.svg --- old/yast2-country-4.1.5/timezone/src/icons/hicolor/scalable/apps/yast-timezone.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-4.1.7/timezone/src/icons/hicolor/scalable/apps/yast-timezone.svg 2018-12-18 16:27:38.000000000 +0100 @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg version="1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"> +<defs> +<linearGradient id="a" x1="2" x2="30" y1="16" y2="16" gradientTransform="scale(4)" gradientUnits="userSpaceOnUse"> +<stop stop-color="#9a9996" offset="0"/> +<stop stop-color="#9a9996" offset=".14286"/> +<stop stop-color="#deddda" offset=".25"/> +<stop stop-color="#9a9996" offset=".39286"/> +<stop stop-color="#9a9996" offset="1"/> +</linearGradient> +</defs> +<path d="m64 8c-31.024 0-56 24.976-56 56s24.976 56 56 56 56-24.976 56-56-24.976-56-56-56z" fill="url(#a)" /> +<rect transform="matrix(0,-1,-1,0,0,0)" x="-116" y="-120" width="112" height="112" rx="56" ry="56" fill="#deddda" /> +<path d="m64 8a52 52 0 0 0 -52 52 52 52 0 0 0 52 52 52 52 0 0 0 52 -52 52 52 0 0 0 -52 -52z" fill="#241f31" /> +<path d="m64 56.268 24-24.267 4 4-24 24z" fill="#77767b" /> +<path d="m64 52a8 8 0 0 0 -8 8 8 8 0 0 0 8 8 8 8 0 0 0 8 -8 8 8 0 0 0 -8 -8z" fill="#c0bfbc" /> +<rect x="60" y="60" width="8" height="48" ry="0" fill="#f6f5f4" /> +<rect x="16" y="56" width="42" height="4" fill="#e01b24" /> +<path d="m64 48a8 8 0 0 0 -8 8 8 8 0 0 0 8 8 8 8 0 0 0 8 -8 8 8 0 0 0 -8 -8z" fill="#deddda" /> +<circle cx="64" cy="56" r="4" fill="#333" /> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/timezone/src/icons/hicolor/symbolic/apps/yast-timezone-symbolic.svg new/yast2-country-4.1.7/timezone/src/icons/hicolor/symbolic/apps/yast-timezone-symbolic.svg --- old/yast2-country-4.1.5/timezone/src/icons/hicolor/symbolic/apps/yast-timezone-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-4.1.7/timezone/src/icons/hicolor/symbolic/apps/yast-timezone-symbolic.svg 2018-12-18 16:27:38.000000000 +0100 @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"> + <path d="M 8 0 C 3.581722 0 0 3.581722 0 8 C 0 12.418278 3.581722 16 8 16 C 8.6752049 15.9962 9.3472143 15.90696 10 15.734375 L 10 13.650391 C 9.3580344 13.879696 8.6816864 13.997925 8 14 C 4.6862915 14 2 11.313708 2 8 C 2 4.6862915 4.6862915 2 8 2 C 11.313708 2 14 4.6862915 14 8 C 13.9973 8.6817991 13.878408 9.3581503 13.648438 10 L 15.740234 10 C 15.910846 9.3469609 15.998128 8.6749555 16 8 C 16 3.581722 12.418278 0 8 0 z M 7.5 3 L 7.5 7.1347656 A 1 1 0 0 0 7 8 A 1 1 0 0 0 7.0351562 8.2578125 L 3.6464844 11.646484 L 4.3535156 12.353516 L 7.7421875 8.9648438 A 1 1 0 0 0 8 9 A 1 1 0 0 0 8.8632812 8.5 L 11 8.5 L 11 7.5 L 8.8652344 7.5 A 1 1 0 0 0 8.5 7.1367188 L 8.5 3 L 7.5 3 z M 11 11 L 11 16 L 16 16 L 16 11 L 11 11 z M 12 12 L 13 12 L 13 13 L 14 13 L 14 12 L 15 12 L 15 14 L 14 14 L 14 15 L 13 15 L 13 14 L 12 14 L 12 12 z " fill="#c0bfbc" /> +</svg>

1 0

commit yast2-storage-ng for openSUSE:Factory
by root 31 Dec '18

31 Dec '18

Hello community, here is the log from the commit of package yast2-storage-ng for openSUSE:Factory checked in at 2018-12-31 09:44:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage-ng (Old) and /work/SRC/openSUSE:Factory/.yast2-storage-ng.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-storage-ng" Mon Dec 31 09:44:28 2018 rev:33 rq:659331 version:4.1.43 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage-ng/yast2-storage-ng.changes 2018-11-18 23:01:16.939594667 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-storage-ng.new.28833/yast2-storage-ng.changes 2018-12-31 09:44:30.286309211 +0100 @@ -1,0 +2,50 @@ +Tue Dec 18 12:43:21 CET 2018 - schubi(a)suse.de + +- Do not touch eMMC boot partitions (mmcblk*boot*) (bsc#1119316) +- 4.1.43 + +------------------------------------------------------------------- +Tue Dec 18 12:02:57 CET 2018 - aschnell(a)suse.com + +- do not use removed function IconPath anymore (bsc#1119699) +- 4.1.42 + +------------------------------------------------------------------- +Tue Dec 11 10:36:52 UTC 2018 - jlopez(a)suse.com + +- Hardening execution of system commands (part of bsc#1118291). +- 4.1.41 + +------------------------------------------------------------------- +Wed Dec 5 17:01:14 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org> + +- Ship only primary icons with module to avoid conflicts (boo#1118521) +- 4.1.40 + +------------------------------------------------------------------- +Tue Dec 4 15:07:42 UTC 2018 - jlopez(a)suse.com + +- Partitioner: does not allow to create BTRFS subvolumes with + unsafe characters in its path (related to bsc#1059972). +- 4.1.39 + +------------------------------------------------------------------- +Fri Nov 30 14:35:44 UTC 2018 - ancor(a)suse.com + +- Support for Raspberry Pi in Guided Proposal: it suggests to keep + the firmware partition and mount it as /boot/vc (fate#323484). +- 4.1.38 + +------------------------------------------------------------------- +Tue Nov 27 05:34:41 UTC 2018 - Noah Davis <noahadvs(a)gmail.com> + +- Provide icon with module (boo#1109310) +- 4.1.37 + +------------------------------------------------------------------- +Thu Nov 22 15:56:50 UTC 2018 - jlopez(a)suse.com + +- Partitioner: add support for UDF filesystem (fate#326877). +- 4.1.36 + +------------------------------------------------------------------- Old: ---- yast2-storage-ng-4.1.35.tar.bz2 New: ---- yast2-storage-ng-4.1.43.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage-ng.spec ++++++ --- /var/tmp/diff_new_pack.Tyw8Le/_old 2018-12-31 09:44:30.838308759 +0100 +++ /var/tmp/diff_new_pack.Tyw8Le/_new 2018-12-31 09:44:30.842308756 +0100 @@ -17,7 +17,7 @@ Name: yast2-storage-ng -Version: 4.1.35 +Version: 4.1.43 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -27,8 +27,8 @@ Requires: yast2 >= 4.1.11 # for AbortException and handle direct abort Requires: yast2-ruby-bindings >= 4.0.6 -# Storage::Luks#uuid -Requires: libstorage-ng-ruby >= 4.1.54 +# for UDF support +Requires: libstorage-ng-ruby >= 4.1.56 # communicate with udisks Requires: rubygem(ruby-dbus) # Y2Packager::Repository @@ -37,8 +37,8 @@ Requires: findutils BuildRequires: update-desktop-files -# Storage::Luks#uuid -BuildRequires: libstorage-ng-ruby >= 4.1.54 +# for UDF support +BuildRequires: libstorage-ng-ruby >= 4.1.56 BuildRequires: yast2-devtools BuildRequires: yast2-ruby-bindings # yast2-xml dependency is added by yast2 but ignored in the @@ -101,6 +101,9 @@ # agents-scr %{yast_scrconfdir}/*.scr +# icons +%{yast_icondir} + %license COPYING %doc README.md %doc CONTRIBUTING.md ++++++ yast2-storage-ng-4.1.35.tar.bz2 -> yast2-storage-ng-4.1.43.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/yast2-storage-ng/yast2-storage-ng-4.1.35.tar.bz2 /work/SRC/openSUSE:Factory/.yast2-storage-ng.new.28833/yast2-storage-ng-4.1.43.tar.bz2 differ: char 11, line 1

1 0

commit libyui-qt for openSUSE:Factory
by root 31 Dec '18

31 Dec '18

Hello community, here is the log from the commit of package libyui-qt for openSUSE:Factory checked in at 2018-12-31 09:44:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt (Old) and /work/SRC/openSUSE:Factory/.libyui-qt.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-qt" Mon Dec 31 09:44:22 2018 rev:53 rq:659317 version:2.49.13 Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt/libyui-qt.changes 2018-11-02 10:49:39.682289175 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-qt.new.28833/libyui-qt.changes 2018-12-31 09:44:23.938314412 +0100 @@ -1,0 +2,36 @@ +Tue Dec 18 14:01:56 UTC 2018 - Stefan Hundhammer <shundhammer(a)suse.com> + +- YImage: Fall back to compiled-in Qt resources (bsc#1119688) +- 2.49.13 + +------------------------------------------------------------------- +Tue Dec 18 13:48:15 CET 2018 - aschnell(a)suse.com + +- log QIcon::themeName (for bsc#1119688) +- 2.49.12 + +------------------------------------------------------------------- +Wed Dec 5 16:57:32 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org> + +- Ship only primary icons with module to avoid conflicts (boo#1118521) +- 2.49.11 + +------------------------------------------------------------------- +Mon Nov 19 13:42:59 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org> + +- Fix YQTree's icon loading function (boo#1116562) +- Fix padding on the left caused by deprecated dialog icon + (boo#1116278) + +------------------------------------------------------------------- +Thu Nov 15 01:42:27 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org> + +- Destroy sidebar where necessary (boo#1115994) + +------------------------------------------------------------------- +Tue Nov 13 07:59:24 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org> + +- Use native icon theme methods (boo#1109378) +- 2.49.8 + +------------------------------------------------------------------- Old: ---- libyui-qt-2.49.7.tar.bz2 New: ---- libyui-qt-2.49.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-doc.spec ++++++ --- /var/tmp/diff_new_pack.oI56qA/_old 2018-12-31 09:44:24.398314034 +0100 +++ /var/tmp/diff_new_pack.oI56qA/_new 2018-12-31 09:44:24.398314034 +0100 @@ -20,7 +20,7 @@ %define so_version 9 Name: %{parent}-doc -Version: 2.49.7 +Version: 2.49.13 Release: 0 Source: %{parent}-%{version}.tar.bz2 ++++++ libyui-qt.spec ++++++ --- /var/tmp/diff_new_pack.oI56qA/_old 2018-12-31 09:44:24.414314022 +0100 +++ /var/tmp/diff_new_pack.oI56qA/_new 2018-12-31 09:44:24.418314018 +0100 @@ -17,7 +17,7 @@ Name: libyui-qt -Version: 2.49.7 +Version: 2.49.13 Release: 0 Source: %{name}-%{version}.tar.bz2 ++++++ libyui-qt-2.49.7.tar.bz2 -> libyui-qt-2.49.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/SOURCECONF.cmake new/libyui-qt-2.49.13/SOURCECONF.cmake --- old/libyui-qt-2.49.7/SOURCECONF.cmake 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/SOURCECONF.cmake 2018-12-18 15:11:48.000000000 +0100 @@ -1,3 +1,5 @@ +set(CMAKE_AUTORCC ON) + SET( ${TARGETLIB}_WRAP_UI QHelpDialog.ui QStyleEditor.ui @@ -64,6 +66,7 @@ YQWizard.cc YQWizardButton.cc QY2StyleEditor.cc + qt_icons.qrc ) SET( ${TARGETLIB}_HEADERS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/VERSION.cmake new/libyui-qt-2.49.13/VERSION.cmake --- old/libyui-qt-2.49.7/VERSION.cmake 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/VERSION.cmake 2018-12-18 15:11:48.000000000 +0100 @@ -1,6 +1,6 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "49") -SET(VERSION_PATCH "7") +SET(VERSION_PATCH "13") SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is needed for the libyui-qt core ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/package/libyui-qt-doc.spec new/libyui-qt-2.49.13/package/libyui-qt-doc.spec --- old/libyui-qt-2.49.7/package/libyui-qt-doc.spec 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/package/libyui-qt-doc.spec 2018-12-18 15:11:48.000000000 +0100 @@ -20,7 +20,7 @@ %define so_version 9 Name: %{parent}-doc -Version: 2.49.7 +Version: 2.49.13 Release: 0 Source: %{parent}-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/package/libyui-qt.changes new/libyui-qt-2.49.13/package/libyui-qt.changes --- old/libyui-qt-2.49.7/package/libyui-qt.changes 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/package/libyui-qt.changes 2018-12-18 15:11:48.000000000 +0100 @@ -1,4 +1,40 @@ ------------------------------------------------------------------- +Tue Dec 18 14:01:56 UTC 2018 - Stefan Hundhammer <shundhammer(a)suse.com> + +- YImage: Fall back to compiled-in Qt resources (bsc#1119688) +- 2.49.13 + +------------------------------------------------------------------- +Tue Dec 18 13:48:15 CET 2018 - aschnell(a)suse.com + +- log QIcon::themeName (for bsc#1119688) +- 2.49.12 + +------------------------------------------------------------------- +Wed Dec 5 16:57:32 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org> + +- Ship only primary icons with module to avoid conflicts (boo#1118521) +- 2.49.11 + +------------------------------------------------------------------- +Mon Nov 19 13:42:59 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org> + +- Fix YQTree's icon loading function (boo#1116562) +- Fix padding on the left caused by deprecated dialog icon + (boo#1116278) + +------------------------------------------------------------------- +Thu Nov 15 01:42:27 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org> + +- Destroy sidebar where necessary (boo#1115994) + +------------------------------------------------------------------- +Tue Nov 13 07:59:24 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org> + +- Use native icon theme methods (boo#1109378) +- 2.49.8 + +------------------------------------------------------------------- Sat Oct 13 00:36:14 UTC 2018 - Stasiek Michalski <hellcp(a)opensuse.org> - Fix style disappearing from sidebar (boo#1111720) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/package/libyui-qt.spec new/libyui-qt-2.49.13/package/libyui-qt.spec --- old/libyui-qt-2.49.7/package/libyui-qt.spec 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/package/libyui-qt.spec 2018-12-18 15:11:48.000000000 +0100 @@ -17,7 +17,7 @@ Name: libyui-qt -Version: 2.49.7 +Version: 2.49.13 Release: 0 Source: %{name}-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/QY2HelpDialog.cc new/libyui-qt-2.49.13/src/QY2HelpDialog.cc --- old/libyui-qt-2.49.7/src/QY2HelpDialog.cc 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/QY2HelpDialog.cc 2018-12-18 15:11:48.000000000 +0100 @@ -32,9 +32,6 @@ #include "YQUI.h" #include "QY2Styler.h" - -#include "icons/viewmag.xpm" - #ifdef TEXTDOMAIN # undef TEXTDOMAIN #endif @@ -50,7 +47,9 @@ _ui = new Ui_QHelpDialog(); _ui->setupUi( this ); _ui->textBrowser->setText( helpText ); - _ui->label->setPixmap ( QPixmap( viewmag ) ); + Q_INIT_RESOURCE(qt_icons); + QIcon icon = QIcon::fromTheme( "edit-find", QIcon( ":/edit-find" ) ); + _ui->label->setPixmap ( icon.pixmap( QSize( 16, 16 ) ) ); connect( _ui->lineEdit, &pclass(_ui->lineEdit)::textEdited, this, &pclass(this)::searchStringChanged ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQApplication.cc new/libyui-qt-2.49.13/src/YQApplication.cc --- old/libyui-qt-2.49.7/src/YQApplication.cc 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/YQApplication.cc 2018-12-18 15:11:48.000000000 +0100 @@ -76,6 +76,8 @@ { yuiDebug() << "YQApplication constructor start" << std::endl; + yuiMilestone() << "QIcon::themeName = '" << QIcon::themeName() << "'" << std::endl; + //setIconBasePath( ICONDIR "/icons/22x22/apps/" ); // the above works too, but let's try it the icon-loader way - FaTE #306356 iconLoader()->addIconSearchPath( ICONDIR "/icons/" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQComboBox.cc new/libyui-qt-2.49.13/src/YQComboBox.cc --- old/libyui-qt-2.49.7/src/YQComboBox.cc 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/YQComboBox.cc 2018-12-18 15:11:48.000000000 +0100 @@ -29,7 +29,6 @@ #include <qlabel.h> #include <qcombobox.h> #include <qlineedit.h> -#include <qpixmap.h> #define YUILogComponent "qt-ui" #include <yui/YUILog.h> @@ -122,11 +121,7 @@ if ( item->hasIconName() ) { - string iconName = iconFullPath( item ); - icon = QIcon( iconName.c_str() ); - - if ( icon.isNull() ) - yuiWarning() << "Can't load icon \"" << iconName << "\"" << std::endl; + icon = YQUI::ui()->loadIcon( item->iconName() ); } if ( icon.isNull() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQContextMenu.cc new/libyui-qt-2.49.13/src/YQContextMenu.cc --- old/libyui-qt-2.49.7/src/YQContextMenu.cc 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/YQContextMenu.cc 2018-12-18 15:11:48.000000000 +0100 @@ -87,15 +87,11 @@ for ( YItemIterator it = begin; it != end; ++it ) { YItem * item = *it; - QPixmap icon; + QIcon icon; if ( item->hasIconName() ) { - std::string iconName = iconFullPath( item ); - icon = QPixmap( iconName.c_str() ); - - if ( icon.isNull() ) - yuiWarning() << "Can't load icon " << iconName << std::endl; + icon = YQUI::ui()->loadIcon( item->iconName() ); } if ( item->hasChildren() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQGenericButton.cc new/libyui-qt-2.49.13/src/YQGenericButton.cc --- old/libyui-qt-2.49.7/src/YQGenericButton.cc 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/YQGenericButton.cc 2018-12-18 15:11:48.000000000 +0100 @@ -26,7 +26,6 @@ #include <qpushbutton.h> #include <qsize.h> #include <qevent.h> -#include <qpixmap.h> #include <qevent.h> #define YUILogComponent "qt-ui" #include <yui/YUILog.h> @@ -128,8 +127,10 @@ } // Search for the icon - FaTE #306356 - qIconName = fromUTF8( YQUI::yqApp()->iconLoader()->findIcon( iconName ) ); - QPixmap icon( qIconName ); + // qIconName = fromUTF8( YQUI::yqApp()->iconLoader()->findIcon( iconName ) ); + // QPixmap icon( qIconName ); + // Use method from Qt instead + QIcon icon = QIcon::fromTheme ( iconName.c_str() ); if ( icon.isNull() ) yuiWarning() << "Can't load icon \"" << qIconName << "\"" << std::endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQImage.cc new/libyui-qt-2.49.13/src/YQImage.cc --- old/libyui-qt-2.49.7/src/YQImage.cc 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/YQImage.cc 2018-12-18 15:11:48.000000000 +0100 @@ -34,6 +34,7 @@ #include "utf8.h" #include "YQImage.h" +using std::endl; YQImage::YQImage( YWidget * parent, @@ -62,50 +63,69 @@ void YQImage::setImage( const std::string & fileName, bool animated ) { - YImage::setImage ( fileName, animated ); + YImage::setImage ( fileName, animated ); - if ( animated ) - { - QMovie movie ( fromUTF8 ( imageFileName() ) ); - - if ( movie.isValid() ) - { - yuiError() << "Couldn't load animation from " << imageFileName() << std::endl; - } - else + if ( animated ) { - yuiDebug() << "Loading animation from " << imageFileName() << std::endl; - QLabel::setMovie ( &movie ); - } - } - else - { - QPixmap pixmap ( fromUTF8 ( imageFileName() ) ); + QMovie movie ( fromUTF8 ( imageFileName() ) ); - if ( pixmap.isNull() ) - { - yuiError() << "Couldn't load pixmap from " << imageFileName() << std::endl; + if ( movie.isValid() ) + { + yuiError() << "Couldn't load animation from " << imageFileName() << endl; + } + else + { + yuiDebug() << "Loading animation from " << imageFileName() << endl; + QLabel::setMovie ( &movie ); + } } else { - if ( autoScale() ) - { - QImage scaledImg = pixmap.toImage(); - scaledImg = scaledImg.scaled ( this->width(), this->height(), Qt::KeepAspectRatio ); - pixmap = pixmap.fromImage ( scaledImg ); - } - _pixmapWidth = pixmap.size().width(); - _pixmapHeight = pixmap.size().height(); - - yuiDebug() << "Loading image from " << imageFileName() - << " (" << pixmap.size().width() << " x " << pixmap.size().height() << ")" - << std::endl; + QPixmap pixmap; - QLabel::setPixmap ( pixmap ); + if ( QIcon::hasThemeIcon( imageFileName().c_str() ) ) // try the desktop theme first + { + yuiDebug() << "Trying theme icon from " << imageFileName() << endl; + QIcon icon = QIcon::fromTheme(imageFileName().c_str()); + pixmap = icon.pixmap(22); + } + else // try loading from a plain file + { + pixmap = QPixmap( fromUTF8 ( imageFileName() ) ); + } + if ( pixmap.isNull() ) // if that failed, try loading from the compiled-in Qt resource files + { + QString name = QString( ":/%1.svg" ).arg( fromUTF8 ( imageFileName() ) ); + yuiDebug() << "Trying built-in Qt resource icon " << name << endl; + QIcon icon( name ); + pixmap = icon.pixmap(22); + } + + if ( pixmap.isNull() ) + { + yuiError() << "Couldn't load pixmap from " << imageFileName() << endl; + } + else + { + if ( autoScale() ) + { + QImage scaledImg = pixmap.toImage(); + scaledImg = scaledImg.scaled( this->width(), this->height(), Qt::KeepAspectRatio ); + pixmap = pixmap.fromImage( scaledImg ); + } + _pixmapWidth = pixmap.size().width(); + _pixmapHeight = pixmap.size().height(); + + yuiDebug() << "Loading image from " << imageFileName() + << " (" << pixmap.size().width() << " x " << pixmap.size().height() << ")" + << endl; + + QLabel::setPixmap ( pixmap ); + } } - } } + void YQImage::setAutoScale( bool newAutoScale ) { if ( autoScale() == newAutoScale ) @@ -170,7 +190,7 @@ void YQImage::setEnabled( bool enable ) { - yuiDebug() << "setEnabled: " << enable << std::endl; + yuiDebug() << "setEnabled: " << enable << endl; if (enable) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQImage.h new/libyui-qt-2.49.13/src/YQImage.h --- old/libyui-qt-2.49.7/src/YQImage.h 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/YQImage.h 2018-12-18 15:11:48.000000000 +0100 @@ -44,9 +44,9 @@ * 'animated' indicates if 'imageFileName' is an animated image format * (e.g., MNG). **/ - YQImage( YWidget * parent, - const std::string & imageFileName, - bool animated = false ); + YQImage( YWidget * parent, + const std::string & imageFileName, + bool animated = false ); /** * Destructor. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQMenuButton.cc new/libyui-qt-2.49.13/src/YQMenuButton.cc --- old/libyui-qt-2.49.7/src/YQMenuButton.cc 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/YQMenuButton.cc 2018-12-18 15:11:48.000000000 +0100 @@ -103,15 +103,11 @@ for ( YItemIterator it = begin; it != end; ++it ) { YItem * item = *it; - QPixmap icon; + QIcon icon; if ( item->hasIconName() ) { - std::string iconName = iconFullPath( item ); - icon = QPixmap( iconName.c_str() ); - - if ( icon.isNull() ) - yuiWarning() << "Can't load icon " << iconName << std::endl; + icon = YQUI::ui()->loadIcon( item->iconName() ); } if ( item->hasChildren() ) @@ -121,7 +117,7 @@ if ( icon.isNull() ) subMenu = parentMenu->addMenu( fromUTF8( item->label() )); else - subMenu = parentMenu->addMenu( QIcon( icon ), fromUTF8( item->label() )); + subMenu = parentMenu->addMenu( icon, fromUTF8( item->label() )); connect( subMenu, &pclass(subMenu)::triggered, this, &pclass(this)::menuEntryActivated ); @@ -139,7 +135,7 @@ if ( icon.isNull() ) act = parentMenu->addAction( fromUTF8( item->label() ) ); else - act = parentMenu->addAction( QIcon( icon ), fromUTF8( item->label() ) ); + act = parentMenu->addAction( icon, fromUTF8( item->label() ) ); _serials[act] = item->index(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQMultiSelectionBox.cc new/libyui-qt-2.49.13/src/YQMultiSelectionBox.cc --- old/libyui-qt-2.49.7/src/YQMultiSelectionBox.cc 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/YQMultiSelectionBox.cc 2018-12-18 15:11:48.000000000 +0100 @@ -346,13 +346,9 @@ if ( yItem->hasIconName() ) { // _table is checked against 0 in the constructor + QIcon icon = YQUI::ui()->loadIcon( yItem->iconName() ); - string iconName = parent->iconFullPath( yItem->iconName() ); - QPixmap icon = QPixmap( iconName.c_str() ); - - if ( icon.isNull() ) - yuiWarning() << "Can't load icon " << iconName << std::endl; - else + if ( !icon.isNull() ) setIcon( 0 /* column */, icon ); } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQSelectionBox.cc new/libyui-qt-2.49.13/src/YQSelectionBox.cc --- old/libyui-qt-2.49.7/src/YQSelectionBox.cc 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/YQSelectionBox.cc 2018-12-18 15:11:48.000000000 +0100 @@ -26,7 +26,6 @@ #include <QLabel> #include <QListWidget> #include <qnamespace.h> -#include <QPixmap> #include <QKeyEvent> #include <QVBoxLayout> #define YUILogComponent "qt-ui" @@ -126,15 +125,11 @@ void YQSelectionBox::addItem( YItem * item, bool batchMode ) { YSelectionBox::addItem( item ); - QPixmap icon; + QIcon icon; if ( item->hasIconName() ) { - string iconName = iconFullPath( item ); - icon = QPixmap( iconName.c_str() ); - - if ( icon.isNull() ) - yuiWarning() << "Can't load icon " << iconName << std::endl; + icon = icon = YQUI::ui()->loadIcon( item->iconName() ); } if ( icon.isNull() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQTable.cc new/libyui-qt-2.49.13/src/YQTable.cc --- old/libyui-qt-2.49.7/src/YQTable.cc 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/YQTable.cc 2018-12-18 15:11:48.000000000 +0100 @@ -453,20 +453,16 @@ if ( cell->hasIconName() ) { // _table is checked against 0 in the constructor + QIcon icon = icon = YQUI::ui()->loadIcon( cell->iconName() ); - string iconName = _table->iconFullPath( cell->iconName() ); - QPixmap icon = QPixmap( iconName.c_str() ); - - if ( icon.isNull() ) - yuiWarning() << "Can't load icon " << iconName << std::endl; - else + if ( !icon.isNull() ) setData( column, Qt::DecorationRole, icon ); } - else // No pixmap name + else // No icon name { - if ( ! data( column, Qt::DecorationRole ).isNull() ) // Was there a pixmap before? + if ( ! data( column, Qt::DecorationRole ).isNull() ) // Was there an icon before? { - setData( column, Qt::DecorationRole, QPixmap() ); // Set empty pixmap + setData( column, Qt::DecorationRole, QIcon() ); // Set empty icon } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQTimezoneSelector.cc new/libyui-qt-2.49.13/src/YQTimezoneSelector.cc --- old/libyui-qt-2.49.7/src/YQTimezoneSelector.cc 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/YQTimezoneSelector.cc 2018-12-18 15:11:48.000000000 +0100 @@ -39,8 +39,7 @@ #include <QMouseEvent> #include <QDebug> #include <QToolTip> - -#include "icons/zoom-in.xpm" +#include <QIcon> class YQTimezoneSelectorPrivate { @@ -243,7 +242,10 @@ } p.drawPixmap( ( width() - d->cachePix.width() ) / 2, ( height() - d->cachePix.height() ) / 2, d->cachePix ); - setCursor( QCursor( QPixmap( zoom_in ) ) ); + Q_INIT_RESOURCE(qt_icons); + QIcon icon = QIcon::fromTheme( "zoom-in", QIcon( ":/zoom-in" ) ); + if ( !icon.isNull() ) + setCursor( QCursor( icon.pixmap( QSize( 16, 16 ) ) ) ); } else { int left = qMin( qMax( d->_zoom.x() - width() / 2, 0 ), d->_pix.width() - width() ); int top = qMin( qMax( d->_zoom.y() - height() / 2, 0 ), d->_pix.height() - height() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQTree.cc new/libyui-qt-2.49.13/src/YQTree.cc --- old/libyui-qt-2.49.7/src/YQTree.cc 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/YQTree.cc 2018-12-18 15:11:48.000000000 +0100 @@ -27,7 +27,7 @@ #include <QTreeWidget> #include <QVBoxLayout> #include <QString> -#include <QPixmap> +#include <QIcon> #define YUILogComponent "qt-ui" #include <yui/YUILog.h> @@ -493,12 +493,12 @@ if ( _origItem->hasIconName() ) { - string iconName = _tree->iconFullPath( _origItem ); - QPixmap icon( iconName.c_str() ); + //YQTree is annoying with how it loads icons, this is an ugly workaround + QIcon icon = QIcon( _tree->iconFullPath( _origItem ).c_str() ); + if ( icon.isNull() ) + icon = YQUI::ui()->loadIcon( _origItem->iconName() ); - if ( icon.isNull() ) - yuiWarning() << "Can't load icon " << iconName << std::endl; - else + if ( !icon.isNull() ) setData( 0, Qt::DecorationRole, icon ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQUI.cc new/libyui-qt-2.49.13/src/YQUI.cc --- old/libyui-qt-2.49.7/src/YQUI.cc 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/YQUI.cc 2018-12-18 15:11:48.000000000 +0100 @@ -691,6 +691,32 @@ yuiError() << "Client killed. Possibly caused by X server shutdown or crash." << std::endl; } +QIcon YQUI::loadIcon( const string & iconName ) const +{ + QIcon icon; + const QString resource = ":/"; + if ( QIcon::hasThemeIcon( iconName.c_str() ) ) + { + yuiDebug() << "Trying theme icon from: " << iconName << std::endl; + icon = QIcon::fromTheme( iconName.c_str(), QIcon( resource + iconName.c_str() ) ); + } + if ( icon.isNull() ) + { + yuiDebug() << "Trying icon from resource: " << iconName << std::endl; + icon = QIcon( resource + iconName.c_str() ); + + } + + if ( icon.isNull() ) + { + yuiDebug() << "Trying icon from path: " << iconName << std::endl; + icon = QIcon( iconName.c_str() ); + } + + if ( icon.isNull() ) + yuiWarning() << "Couldn't load icon: " << iconName << std::endl; + return icon; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQUI.h new/libyui-qt-2.49.13/src/YQUI.h --- old/libyui-qt-2.49.7/src/YQUI.h 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/YQUI.h 2018-12-18 15:11:48.000000000 +0100 @@ -28,6 +28,7 @@ #include <qapplication.h> #include <QMap> #include <QTimer> +#include <QIcon> #include <vector> #include <type_traits> @@ -286,6 +287,8 @@ **/ void setApplicationTitle(const QString& title) { _applicationTitle=title; } + QIcon loadIcon( const string& iconName ) const; + protected: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQWizard.cc new/libyui-qt-2.49.13/src/YQWizard.cc --- old/libyui-qt-2.49.7/src/YQWizard.cc 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/YQWizard.cc 2018-12-18 15:11:48.000000000 +0100 @@ -46,6 +46,7 @@ #include <qtabwidget.h> #include <qtoolbutton.h> #include <QGraphicsDropShadowEffect> +#include <QFileInfo> #include "QY2ListView.h" #include "QY2Styler.h" @@ -114,7 +115,7 @@ setWidgetRep( this ); //either main wizard with `opt(`stepsEnabled), or sub-wizard of steps-enabled wizard - _stepsEnabled = ( (wizardMode == YWizardMode_Steps) || main_wizard ); + _stepsEnabled = (wizardMode == YWizardMode_Steps); _treeEnabled = (wizardMode == YWizardMode_Tree); _stepsRegistered = false; @@ -151,23 +152,23 @@ if( topLevelWidget()->windowTitle().isEmpty() ) { topLevelWidget()->setWindowTitle ( YQUI::ui()->applicationTitle() ); - QPixmap pixmap ( YUI::app()->applicationIcon().c_str() ); - if ( !pixmap.isNull() ) - setWindowIcon ( QIcon ( pixmap ) ); + QString icon_name = QFileInfo( YUI::app()->applicationIcon().c_str() ).baseName(); + setWindowIcon ( QIcon::fromTheme( icon_name, QIcon( YUI::app()->applicationIcon().c_str() ) ) ); } layout->addLayout( layoutSideBar( this ) ); layout->addWidget( layoutWorkArea( this ) ); - setStretchFactor(indexOf(_sideBar),0); - setStretchFactor(indexOf(_workArea),1); + setStretchFactor( indexOf( _sideBar ), 0 ); + setStretchFactor( indexOf( _workArea ), 1 ); + setCollapsible( indexOf( _sideBar ), false ); /* If steps are enabled, we want to delay the registering for after we have steps registered */ if ( !_stepsEnabled ) QY2Styler::styler()->registerWidget( this ); - if ( !main_wizard && _stepsEnabled ) + if ( !main_wizard ) { main_wizard = this; } @@ -778,6 +779,7 @@ headingHBox->addWidget( _dialogIcon ); _dialogIcon->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ) ); // hor/vert _dialogIcon->setObjectName( "DialogIcon" ); + _dialogIcon->hide(); _dialogHeading = new QLabel( _workArea ); YUI_CHECK_NEW( _dialogHeading ); @@ -999,15 +1001,20 @@ QPixmap icon( iconName.c_str() ); if ( icon.isNull() ) + { + _dialogIcon->hide(); yuiWarning() << "Couldn't load dialog icon \"" << iconName << "\"" << std::endl; + } else { + _dialogIcon->show(); _dialogIcon->setPixmap( icon ); topLevelWidget()->setWindowIcon( icon ); } } else { + _dialogIcon->hide(); _dialogIcon->clear(); topLevelWidget()->setWindowIcon( QIcon() ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/computer.svg new/libyui-qt-2.49.13/src/icons/computer.svg --- old/libyui-qt-2.49.7/src/icons/computer.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/computer.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="M3 1c-1.108 0-2 .892-2 2v7c0 1.108.892 2 2 2h10c1.108 0 2-.892 2-2V3c0-1.108-.892-2-2-2zm0 2h10v7H3zm2 10c-.554 0-1 .446-1 1v1h8v-1c0-.554-.446-1-1-1z" fill="#c0bfbc"/></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/configure.svg new/libyui-qt-2.49.13/src/icons/configure.svg --- old/libyui-qt-2.49.7/src/icons/configure.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/configure.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="M7 1l-.777 2.332a5 5 0 0 0-.268.11L3.758 2.343 2.344 3.758l1.1 2.199a5 5 0 0 0-.116.268L1 7v2l2.332.777a5 5 0 0 0 .11.268l-1.098 2.197 1.414 1.414 2.199-1.1a5 5 0 0 0 .268.116L7 15h2l.777-2.332a5 5 0 0 0 .268-.11l2.197 1.098 1.414-1.414-1.1-2.199a5 5 0 0 0 .116-.268L15 9V7l-2.332-.777a5 5 0 0 0-.11-.268l1.098-2.197-1.414-1.414-2.199 1.1a5 5 0 0 0-.268-.116L9 1zm1 3a4 4 0 0 1 2.87 1.213A4 4 0 0 1 12 8a4 4 0 0 1-1.213 2.87A4 4 0 0 1 8 12a4 4 0 0 1-2.87-1.213A4 4 0 0 1 4 8a4 4 0 0 1 1.213-2.87A4 4 0 0 1 8 4z" fill="#c0bfbc"/></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/dialog-error.svg new/libyui-qt-2.49.13/src/icons/dialog-error.svg --- old/libyui-qt-2.49.7/src/icons/dialog-error.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/dialog-error.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" fill="#fff" r="8"/><circle cx="8" cy="8" fill="#e01b24" r="6"/><path d="M4 7h8v2H4z" fill="#fff"/></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/dialog-information.svg new/libyui-qt-2.49.13/src/icons/dialog-information.svg --- old/libyui-qt-2.49.7/src/icons/dialog-information.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/dialog-information.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" fill="#fff" r="8"/><circle cx="8" cy="8" fill="#3584e4" r="6"/><g fill="#fff"><rect height="2" ry="1" width="2" x="7" y="4"/><path d="M7 7h2v5H7z"/></g></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/dialog-question.svg new/libyui-qt-2.49.13/src/icons/dialog-question.svg --- old/libyui-qt-2.49.7/src/icons/dialog-question.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/dialog-question.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="M7.97 0a2 2 0 0 0-1.384.586l-6 6a2 2 0 0 0 0 2.828l6 6a2 2 0 0 0 2.828 0l6-6a2 2 0 0 0 0-2.828l-6-6A2 2 0 0 0 7.971 0z" fill="#fff"/><path d="M8 2L2 8l6 6 6-6z" fill="#3584e4"/><g fill="#fff"><path d="M7 11h1v1H7zm1-6c-1.108 0-2 .892-2 2h1c0-.554.446-1 1-1s1 .446 1 1-.446 1-1 1v1c1.108 0 2-.892 2-2s-.892-2-2-2z"/><path d="M7 8h1v2H7z"/></g></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/dialog-warning.svg new/libyui-qt-2.49.13/src/icons/dialog-warning.svg --- old/libyui-qt-2.49.7/src/icons/dialog-warning.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/dialog-warning.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="M8 1a1 1 0 0 0-.807.494l-7 12a1 1 0 0 0 .864 1.504h14a1 1 0 0 0 .863-1.504l-7-12A1 1 0 0 0 8 1z"/><path d="M8.057 3.98L2.795 13h10.523z" fill="#f6d32d"/><path d="M7 7h2v3H7zm0 4h2v1H7z"/></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/drive-harddisk-encrypted.svg new/libyui-qt-2.49.13/src/icons/drive-harddisk-encrypted.svg --- old/libyui-qt-2.49.7/src/icons/drive-harddisk-encrypted.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/drive-harddisk-encrypted.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="M3 0C1.892 0 1 .892 1 2v12c0 1.108.892 2 2 2h6v-2H3V2h10v6h2V2c0-1.108-.892-2-2-2zm5 3C5.784 3 4 4.784 4 7s1.784 4 4 4c.349 0 .68-.061 1-.146v-.35l-.73-2.559C8.182 7.97 8.096 8 8 8c-.554 0-1-.446-1-1s.446-1 1-1a.998.998 0 0 1 .926 1.371L10.5 8h1.355c.085-.32.145-.652.145-1 0-2.216-1.784-4-4-4zm5 6c-1.108 0-2 .892-2 2v1h-1v4h6v-4h-1v-1c0-1.108-.892-2-2-2zm0 1c.554 0 1 .446 1 1v1h-2v-1c0-.554.446-1 1-1z" fill="#c0bfbc"/></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/drive-harddisk.svg new/libyui-qt-2.49.13/src/icons/drive-harddisk.svg --- old/libyui-qt-2.49.7/src/icons/drive-harddisk.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/drive-harddisk.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="M3 0C1.892 0 1 .892 1 2v12c0 1.108.892 2 2 2h10c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 2h10v12H3zm5 1C5.784 3 4 4.784 4 7s1.784 4 4 4c.382 0 .744-.069 1.094-.168L8.27 7.945C8.182 7.97 8.096 8 8 8c-.554 0-1-.446-1-1s.446-1 1-1a.998.998 0 0 1 .926 1.371l2.785 1.113A3.991 3.991 0 0 0 8 3zm1 5l1.203 4.574c.14.534.957.531 1.399.2.441-.332.552-.976.199-1.401z" fill="#c0bfbc"/></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/drive-multidisk.svg new/libyui-qt-2.49.13/src/icons/drive-multidisk.svg --- old/libyui-qt-2.49.7/src/icons/drive-multidisk.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/drive-multidisk.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="M3 0C1.892 0 1 .892 1 2v10c0 1.108.892 2 2 2h8c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 2h8v10H3zm11 1v12H3c0 .554.446 1 1 1h10c.554 0 1-.446 1-1V4c0-.554-.446-1-1-1zM7 3C5.338 3 4 4.338 4 6a2.993 2.993 0 0 0 3.588 2.941l-.393-1.96a1 1 0 1 1 .698-.534l1.78.89C9.877 6.935 10 6.485 10 6c0-1.662-1.338-3-3-3z" fill="#c0bfbc"/></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/drive-multipartition.svg new/libyui-qt-2.49.13/src/icons/drive-multipartition.svg --- old/libyui-qt-2.49.7/src/icons/drive-multipartition.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/drive-multipartition.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><g fill="#c0bfbc"><path d="M3 0C1.892 0 1 .892 1 2v10c0 1.108.892 2 2 2h5v-2H3V2h8v6h2V2c0-1.108-.892-2-2-2zm4 3C5.338 3 4 4.338 4 6a2.993 2.993 0 0 0 3.588 2.941l-.393-1.96a1 1 0 1 1 .698-.534l1.78.89C9.877 6.935 10 6.485 10 6c0-1.662-1.338-3-3-3zm7 0v5h1V4c0-.554-.446-1-1-1zM3 15c0 .554.446 1 1 1h4v-1H4z"/><path d="M12.5 8.95a3.5 3.5 0 1 0 0 7 3.5 3.5 0 0 0 0-7zM13 10a2.5 2.5 0 0 1-.5 4.95 2.5 2.5 0 0 1-2.445-2H13z"/></g></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/drive-partition.svg new/libyui-qt-2.49.13/src/icons/drive-partition.svg --- old/libyui-qt-2.49.7/src/icons/drive-partition.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/drive-partition.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="M3 0C1.892 0 1 .892 1 2v12c0 1.108.892 2 2 2h5v-2H3V2h10v6h2V2c0-1.108-.892-2-2-2zm5 3C5.784 3 4 4.784 4 7s1.784 4 4 4V8c-.554 0-1-.446-1-1s.446-1 1-1a.998.998 0 0 1 .926 1.371L10.5 8h1.355c.085-.32.145-.652.145-1 0-2.216-1.784-4-4-4zm0 5h.285l-.015-.055C8.182 7.97 8.096 8 8 8zm4.5 1A3.5 3.5 0 0 0 9 12.5a3.5 3.5 0 0 0 3.5 3.5 3.5 3.5 0 0 0 3.5-3.5A3.5 3.5 0 0 0 12.5 9zm.5 1.05a2.5 2.5 0 0 1 2 2.45 2.5 2.5 0 0 1-2.5 2.5 2.5 2.5 0 0 1-2.445-2H13z" fill="#c0bfbc"/></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/edit-find.svg new/libyui-qt-2.49.13/src/icons/edit-find.svg --- old/libyui-qt-2.49.7/src/icons/edit-find.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/edit-find.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16.000001" version="1.1" id="svg4243"> + + <defs + id="defs4237" /> + <metadata + id="metadata4240"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <path + id="path823" + d="M 6,0 C 2.6862915,0 0,2.6862915 0,6 c 0,3.3137085 2.6862915,6 6,6 1.2450211,-0.0018 2.458645,-0.390881 3.4726562,-1.113281 1.6067708,1.60677 3.2135418,3.213541 4.8203128,4.820312 l 1.414062,-1.414062 C 14.069214,12.655153 12.583263,11.169201 10.884766,9.4707031 11.607475,8.4574674 11.997214,7.2445668 12,6 12,2.6862915 9.3137085,0 6,0 Z m 0,2 c 2.209139,0 4,1.790861 4,4 0,2.209139 -1.790861,4 -4,4 C 3.790861,10 2,8.209139 2,6 2,3.790861 3.790861,2 6,2 Z" + style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/emblem-warning.svg new/libyui-qt-2.49.13/src/icons/emblem-warning.svg --- old/libyui-qt-2.49.7/src/icons/emblem-warning.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/emblem-warning.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="M7.977 0a1 1 0 0 0-.858.525l-7 13A1 1 0 0 0 1 15h14a1 1 0 0 0 .88-1.475l-7-13A1 1 0 0 0 7.978 0zM7 4h2v6H7zm0 7h2v2H7z" fill="#c0bfbc"/></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/folder-remote.svg new/libyui-qt-2.49.13/src/icons/folder-remote.svg --- old/libyui-qt-2.49.7/src/icons/folder-remote.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/folder-remote.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="M2 0C.892 0 0 .892 0 2v13c0 .554.446 1 1 1h14c.554 0 1-.446 1-1V4c0-.554-.446-1-1-1H9V2c0-1.108-.892-2-2-2zm8.5 5c.831 0 1.5.669 1.5 1.5S11.331 8 10.5 8c-.316 0-.608-.098-.85-.264L6.12 9.504l3.528 1.762A1.497 1.497 0 0 1 12 12.5c0 .831-.669 1.5-1.5 1.5S9 13.331 9 12.5c0-.143.027-.277.064-.408L5.69 10.406A1.497 1.497 0 0 1 3 9.5a1.497 1.497 0 0 1 2.694-.902l3.371-1.69A1.488 1.488 0 0 1 9 6.5c0-.831.669-1.5 1.5-1.5z" fill="#c0bfbc"/></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/media-removable.svg new/libyui-qt-2.49.13/src/icons/media-removable.svg --- old/libyui-qt-2.49.7/src/icons/media-removable.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/media-removable.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="M4 6v6c0 2.216 1.784 4 4 4s4-1.784 4-4V6H8zm1 1h6v1H5zm0 2h6v1H5zm0 2h6v1H5zM5 1v4h6V1zm1 1h1v1H6zm3 0h1v1H9z" fill="#c0bfbc"/></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/view-list-text.svg new/libyui-qt-2.49.13/src/icons/view-list-text.svg --- old/libyui-qt-2.49.7/src/icons/view-list-text.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/view-list-text.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="M3 9h8c.554 0 1 .446 1 1s-.446 1-1 1H3c-.554 0-1-.446-1-1s.446-1 1-1zm0 4h4c.554 0 1 .446 1 1s-.446 1-1 1H3c-.554 0-1-.446-1-1s.446-1 1-1zm0-8h10c.554 0 1 .446 1 1s-.446 1-1 1H3c-.554 0-1-.446-1-1s.446-1 1-1zm0-4h6c.554 0 1 .446 1 1s-.446 1-1 1H3c-.554 0-1-.446-1-1s.446-1 1-1z" fill="#c0bfbc"/></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/view-list-tree.svg new/libyui-qt-2.49.13/src/icons/view-list-tree.svg --- old/libyui-qt-2.49.7/src/icons/view-list-tree.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/view-list-tree.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="M10 13h5v1h-5zm0-5h5v1h-5zM6 2v2h9V2zM2 6v8h3v-1H3V9h2V8H3V6zm5 6h1c.554 0 1 .446 1 1v1c0 .554-.446 1-1 1H7c-.554 0-1-.446-1-1v-1c0-.554.446-1 1-1zm0-5h1c.554 0 1 .446 1 1v1c0 .554-.446 1-1 1H7c-.554 0-1-.446-1-1V8c0-.554.446-1 1-1zM2 1h2c.554 0 1 .446 1 1v2c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z" fill="#c0bfbc"/></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/view-list.svg new/libyui-qt-2.49.13/src/icons/view-list.svg --- old/libyui-qt-2.49.7/src/icons/view-list.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/view-list.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><g fill="#c0bfbc"><rect height="4" ry="1" width="4" x="2" y="1"/><rect height="4" ry="1" width="4" x="2" y="6"/><path d="M7 2h7v2H7zm0 5h7v2H7z"/><rect height="4" ry="1" width="4" x="2" y="11"/><path d="M7 12h7v2H7z"/></g></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/viewmag.xpm new/libyui-qt-2.49.13/src/icons/viewmag.xpm --- old/libyui-qt-2.49.7/src/icons/viewmag.xpm 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/icons/viewmag.xpm 1970-01-01 01:00:00.000000000 +0100 @@ -1,133 +0,0 @@ -/* XPM */ -static const char *viewmag[] = { -/* columns rows colors chars-per-pixel */ -"16 16 111 2", -" c #7A4D27", -". c #61596B", -"X c #6E6F7D", -"o c #874D18", -"O c #A05A13", -"+ c #AF6816", -"@ c #BD7116", -"# c #855427", -"$ c #94622D", -"% c #A36E2C", -"& c #815C41", -"* c #81624C", -"= c #AD7E4A", -"- c #D5902D", -"; c #D7902C", -": c #D8912B", -"> c #DF9A33", -", c #D1A65A", -"< c #D7AE63", -"1 c #D2B16D", -"2 c #D1B16E", -"3 c #DAB66D", -"4 c #F3CC77", -"5 c #F5D07A", -"6 c #F5D07B", -"7 c #707482", -"8 c #887D81", -"9 c #7F8188", -"0 c #7E8289", -"q c #83848A", -"w c #86898D", -"e c #998C8D", -"r c #838993", -"t c #8C8D91", -"y c #8C8C94", -"u c #8E8F97", -"i c #888898", -"p c #89909A", -"a c #8E939D", -"s c #8E929F", -"d c #8E949D", -"f c #929499", -"g c #91979E", -"h c #A0A8B2", -"j c #A6AEB7", -"k c #AAAEB8", -"l c #ACB0B6", -"z c #AEB2B9", -"x c #ACB3BB", -"c c #AFB5BB", -"v c #B0B6BB", -"b c #B1B6BC", -"n c #B1BAC1", -"m c #B4BDC3", -"M c #B4BEC4", -"N c #B9C3C9", -"B c #BBC5CA", -"V c #BEC6CB", -"C c #BDC7CC", -"Z c #BEC8CD", -"A c #BFC8CE", -"S c #BFC9CE", -"D c #C6C8C9", -"F c #C4CACC", -"G c #C3CCCE", -"H c #C2CCD0", -"J c #C3CDD0", -"K c #C4CED2", -"L c #C5CED3", -"P c #C6CFD3", -"I c #C7D1D5", -"U c #C8D1D4", -"Y c #C9D3D7", -"T c #CBD4D7", -"R c #CCD6D9", -"E c #CDD7DA", -"W c #CED8DA", -"Q c #D1D5D5", -"! c #D0D9DB", -"~ c #D1DBDC", -"^ c #D2DBDC", -"/ c #D2DADD", -"( c #D5DDDF", -") c #D5DEDF", -"_ c #D6DEE0", -"` c #D6DFE0", -"' c #D7E0E2", -"] c #D8E1E2", -"[ c #D9E2E3", -"{ c #DAE2E2", -"} c #DBE2E3", -"| c #DDE5E5", -" . c #DEE6E7", -".. c #DFE7E7", -"X. c #E1E1E2", -"o. c #E0E7E8", -"O. c #E0E8E8", -"+. c #E1E8E9", -"@. c #E2EAEA", -"#. c #E3EAEA", -"$. c #E6EAEA", -"%. c #E6ECEC", -"&. c #E7EDED", -"*. c #E8EDED", -"=. c #EBF0F0", -"-. c #ECF0F1", -";. c #EDF1F1", -":. c #F0F4F4", -">. c #F3F6F6", -",. c #F8F9F9", -"<. c None", -/* pixels */ -"<.<.<.k x c b z <.<.<.<.<.<.<.<.", -"<.<.j M C S A V v <.<.<.<.<.<.<.", -"<.h N T ^ R K I U l <.<.<.<.<.<.", -"s n Y ..*./ ` ~ ) F <.<.<.<.<.<.", -"a B ! &.-._ o.| .{ f <.<.<.<.<.", -"g Z P E ( +.&.%.*.%.t <.<.<.<.<.", -"r S L ! } %.*.;.:.$.q <.<.<.<.<.", -"7 m H R [ #.=.>.,.D <.<.<.<.<.<.", -"<.p J W ] @.=.>.X.y <.<.<.<.<.<.", -"<.<.d G ' O.*.Q u i e <.<.<.<.<.", -"<.<.<.0 0 w 9 X <.8 = ; @ <.<.<.", -"<.<.<.<.<.<.<.<.<.<., 6 > + <.<.", -"<.<.<.<.<.<.<.<.<.<.% 3 5 : O <.", -"<.<.<.<.<.<.<.<.<.<.<.$ 1 4 - o ", -"<.<.<.<.<.<.<.<.<.<.<.<.# 2 < & ", -"<.<.<.<.<.<.<.<.<.<.<.<.<. * . " -}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/zoom-in.svg new/libyui-qt-2.49.13/src/icons/zoom-in.svg --- old/libyui-qt-2.49.7/src/icons/zoom-in.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/icons/zoom-in.svg 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16.000001" version="1.1" id="svg4243"> + + <defs + id="defs4237" /> + <metadata + id="metadata4240"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <path + id="path819" + d="M 5,3 V 9 H 7 V 3 Z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#33d17a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <path + id="path821" + d="M 3,5 V 7 H 9 V 5 Z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#33d17a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <path + id="path823" + d="M 6,0 C 2.6862915,0 0,2.6862915 0,6 c 0,3.3137085 2.6862915,6 6,6 1.2450211,-0.0018 2.458645,-0.390881 3.4726562,-1.113281 1.6067708,1.60677 3.2135418,3.213541 4.8203128,4.820312 l 1.414062,-1.414062 C 14.069214,12.655153 12.583263,11.169201 10.884766,9.4707031 11.607475,8.4574674 11.997214,7.2445668 12,6 12,2.6862915 9.3137085,0 6,0 Z m 0,2 c 2.209139,0 4,1.790861 4,4 0,2.209139 -1.790861,4 -4,4 C 3.790861,10 2,8.209139 2,6 2,3.790861 3.790861,2 6,2 Z" + style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/zoom-in.xpm new/libyui-qt-2.49.13/src/icons/zoom-in.xpm --- old/libyui-qt-2.49.7/src/icons/zoom-in.xpm 2018-10-16 14:04:32.000000000 +0200 +++ new/libyui-qt-2.49.13/src/icons/zoom-in.xpm 1970-01-01 01:00:00.000000000 +0100 @@ -1,162 +0,0 @@ -/* XPM */ -static const char *zoom_in[] = { -/* columns rows colors chars-per-pixel */ -"24 24 132 2", -" c black", -". c #010101", -"X c #020202", -"o c gray1", -"O c gray2", -"+ c #060606", -"@ c #090909", -"# c gray4", -"$ c #0B0B0B", -"% c #0E0E0E", -"& c gray6", -"* c #101010", -"= c #111111", -"- c #131313", -"; c gray8", -": c #1B1B1B", -"> c gray11", -", c gray12", -"< c #202020", -"1 c gray13", -"2 c #222222", -"3 c gray15", -"4 c #272727", -"5 c gray16", -"6 c gray17", -"7 c #2D2D2D", -"8 c gray18", -"9 c gray19", -"0 c #313131", -"q c #343434", -"w c #3A3A3A", -"e c gray23", -"r c #3C3C3C", -"t c #3F3F3F", -"y c #414141", -"u c gray26", -"i c #434343", -"p c #444444", -"a c gray27", -"s c #4C4C4C", -"d c #515151", -"f c gray34", -"g c #5B5B5B", -"h c gray37", -"j c #5F5F5F", -"k c gray38", -"l c #676767", -"z c #686868", -"x c #6D6D6D", -"c c gray45", -"v c gray46", -"b c #777777", -"n c #797979", -"m c gray48", -"M c #909090", -"N c #939393", -"B c gray60", -"V c #9A9A9A", -"C c #9B9B9B", -"Z c #9D9D9D", -"A c gray63", -"S c #A5A5A5", -"D c #A7A7A7", -"F c gray66", -"G c gray67", -"H c #B2B2B2", -"J c #B4B4B4", -"K c #B6B6B6", -"L c gray72", -"P c #B9B9B9", -"I c gray73", -"U c #BBBBBB", -"Y c #BCBCBC", -"T c gray74", -"R c gray75", -"E c #C1C1C1", -"W c gray76", -"Q c #C5C5C5", -"! c #C6C6C6", -"~ c gray78", -"^ c #C8C8C8", -"/ c gray79", -"( c #CACACA", -") c #CBCBCB", -"_ c gray80", -"` c #CDCDCD", -"' c #CECECE", -"] c gray81", -"[ c #D0D0D0", -"{ c gray82", -"} c #D2D2D2", -"| c LightGray", -" . c gray83", -".. c #D5D5D5", -"X. c gray84", -"o. c #D7D7D7", -"O. c #D8D8D8", -"+. c gray85", -"@. c #DADADA", -"#. c gray86", -"$. c gainsboro", -"%. c #DFDFDF", -"&. c gray88", -"*. c #E1E1E1", -"=. c #E2E2E2", -"-. c gray89", -";. c #E4E4E4", -":. c gray90", -">. c #E6E6E6", -",. c #E7E7E7", -"<. c #E9E9E9", -"1. c #EAEAEA", -"2. c gray92", -"3. c #ECECEC", -"4. c gray93", -"5. c #EEEEEE", -"6. c #EFEFEF", -"7. c gray94", -"8. c #F1F1F1", -"9. c gray95", -"0. c #F3F3F3", -"q. c #F4F4F4", -"w. c gray96", -"e. c #F6F6F6", -"r. c #F8F8F8", -"t. c #F9F9F9", -"y. c gray98", -"u. c #FBFBFB", -"i. c gray99", -"p. c #FDFDFD", -"a. c #FEFEFE", -"s. c None", -/* pixels */ -"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.", -"s.s.s.s.s.s.s.q 7 5 3 3 3 s.s.s.s.s.s.s.s.s.s.s.", -"s.s.s.s.s.8 9 c A J H Z l < > s.s.s.s.s.s.s.s.s.", -"s.s.s.s.4 k J ( ] [ ' / E D s - s.s.s.s.s.s.s.s.", -"s.s.s.2 v ( | #.,.6.0.8.:.} Y h * s.s.s.s.s.s.s.", -"s.s.1 g _ o.:.w.y.u.y.r.w.7.*.W i & s.s.s.s.s.s.", -"s.s., P X.,.t.u.p.a a u.r.9.3.;.G % s.s.s.s.s.s.", -"s.: x } *.w.y.p.a.a a i.t.w.5.>.#.f @ s.s.s.s.s.", -"s.; F O.5.e.t.i.a.a a u.r.q.5.>.$.C + s.s.s.s.s.", -"s.= Q %.6.w.p p a a a p i u 4.:.#.R + s.s.s.s.s.", -"s.% ! -.3.9.i p p p p i u y 1.&.o.I O s.s.s.s.s.", -"s.$ S *.,.4.8.q.e.i i 0.6.3.;.#.{ N X s.s.s.s.s.", -"s.# j +.*.>.2.5.6.y y 4.<.;.#. .( s s.s.s.s.s.", -"s.s.# J O.$.=.:.>.t t -.%.@. .) A X s.s.s.s.s.s.", -"s.s.+ e _ } .@.#.@.#.O...[ ^ T 8 s.s.s.s.s.s.", -"s.s.s.O d W ~ ) _ ` ) ) ^ W L a s.s.s.s.s.s.s.", -"s.s.s.s.o 0 B U T Y Y Y K M 6 s.s.s.s.s.s.", -"s.s.s.s.s.. o y m V V b r s. s.s.s.s.", -"s.s.s.s.s.s.s. s.s.s.s.< < s.s.s.", -"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s. z q s.s.", -"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s. n w s.", -"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s. z , s.", -"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s. s.s.", -"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s." -}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.7/src/qt_icons.qrc new/libyui-qt-2.49.13/src/qt_icons.qrc --- old/libyui-qt-2.49.7/src/qt_icons.qrc 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.49.13/src/qt_icons.qrc 2018-12-18 15:11:48.000000000 +0100 @@ -0,0 +1,24 @@ +<!DOCTYPE RCC> +<RCC version="1.0"> + <qresource> + <file alias="computer">icons/computer.svg</file> + <file alias="configure">icons/configure.svg</file> + <file alias="dialog-error">icons/dialog-error.svg</file> + <file alias="dialog-information">icons/dialog-information.svg</file> + <file alias="dialog-question">icons/dialog-question.svg</file> + <file alias="dialog-warning">icons/dialog-warning.svg</file> + <file alias="drive-harddisk-encrypted">icons/drive-harddisk-encrypted.svg</file> + <file alias="drive-harddisk">icons/drive-harddisk.svg</file> + <file alias="drive-multidisk">icons/drive-multidisk.svg</file> + <file alias="drive-multipartition">icons/drive-multipartition.svg</file> + <file alias="drive-partition">icons/drive-partition.svg</file> + <file alias="edit-find">icons/edit-find.svg</file> + <file alias="emblem-warning">icons/emblem-warning.svg</file> + <file alias="folder-remote">icons/folder-remote.svg</file> + <file alias="media-removable">icons/media-removable.svg</file> + <file alias="view-list">icons/view-list.svg</file> + <file alias="view-list-text">icons/view-list-text.svg</file> + <file alias="view-list-tree">icons/view-list-tree.svg</file> + <file alias="zoom-in">icons/zoom-in.svg</file> + </qresource> +</RCC>

1 0

commit yast2-installation-control for openSUSE:Factory
by root 31 Dec '18

31 Dec '18

Hello community, here is the log from the commit of package yast2-installation-control for openSUSE:Factory checked in at 2018-12-31 09:44:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation-control (Old) and /work/SRC/openSUSE:Factory/.yast2-installation-control.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation-control" Mon Dec 31 09:44:18 2018 rev:22 rq:659288 version:4.1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation-control/yast2-installation-control.changes 2018-11-22 13:24:04.682090508 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-installation-control.new.28833/yast2-installation-control.changes 2018-12-31 09:44:19.994317642 +0100 @@ -1,0 +2,12 @@ +Mon Dec 17 12:08:31 UTC 2018 - igonzalezsosa(a)suse.com + +- Add a configuration_management section (fate#322722). +- 4.1.6 + +------------------------------------------------------------------- +Fri Dec 14 11:50:09 UTC 2018 - dgonzalez(a)suse.com + +- Add macros related to skelcd (fate#325482) +- 4.1.5 + +------------------------------------------------------------------- Old: ---- yast2-installation-control-4.1.4.tar.bz2 New: ---- yast2-installation-control-4.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation-control.spec ++++++ --- /var/tmp/diff_new_pack.Dm8bFr/_old 2018-12-31 09:44:20.394317314 +0100 +++ /var/tmp/diff_new_pack.Dm8bFr/_new 2018-12-31 09:44:20.394317314 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation-control -Version: 4.1.4 +Version: 4.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,6 +49,8 @@ %dir %{yast_controldir} %{yast_controldir}/*.rng %{yast_controldir}/*.rnc +%dir /etc/rpm +/etc/rpm/macros.skelcd %license COPYING %doc %{yast_docdir} ++++++ yast2-installation-control-4.1.4.tar.bz2 -> yast2-installation-control-4.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-4.1.4/control/control.rnc new/yast2-installation-control-4.1.6/control/control.rnc --- old/yast2-installation-control-4.1.4/control/control.rnc 2018-11-22 11:01:23.000000000 +0100 +++ new/yast2-installation-control-4.1.6/control/control.rnc 2018-12-18 13:48:32.000000000 +0100 @@ -1057,6 +1057,51 @@ # update +configuration_management = element configuration_management { + # Configuration managment system to use + element type { "salt" | "puppet" } & + # Host name or IP address of the master server + element master { text }? & + # Number of attempts when trying to connect to the master server + element auth_attempts { INTEGER }? & + # Time between attempts to connect to the master server + element auth_time_out { INTEGER }? & + # Path to an HTTTP(S) server, hard disk, USB driver or similar containing the + # private/public keys to connect to the master server + element keys_url { text }? & + # Enable the configuration management system services after the installation + element enable_services { BOOLEAN }? & + + # Salt specific + + # Path to write Pillar data + element pillar_root { text }? & + # URL to read Pillar data from + element pillar_url { text }? & + # Paths to search for formulas + element formulas_roots { + LIST, + element formulas_root { text }+ + }? & + # Paths to search for states + element states_roots { + LIST, + element states_root { text }+ + }? & + # URL to get states from + element states_url { text }? & + # List of states/formulas to enable + element enabled_states { + LIST, + element state { text }+ + }? & + + # Puppet specific + + # URL to read Puppet modules from + element modules_url { text }? +} + # not more than one partitioning element productDefines_elements = textdomain* @@ -1071,6 +1116,7 @@ & inst_finish_stages* & update* & system_roles* + & configuration_management? start = element productDefines { productDefines_elements diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-4.1.4/control/control.rng new/yast2-installation-control-4.1.6/control/control.rng --- old/yast2-installation-control-4.1.4/control/control.rng 2018-11-22 11:01:23.000000000 +0100 +++ new/yast2-installation-control-4.1.6/control/control.rng 2018-12-18 13:48:32.000000000 +0100 @@ -2229,6 +2229,111 @@ </element> </define>  + <define name="configuration_management"> + <element name="configuration_management"> + <interleave> +  + <element name="type"> + <choice> + <value>salt</value> + <value>puppet</value> + </choice> + </element> + <optional> +  + <element name="master"> + <text/> + </element> + </optional> + <optional> +  + <element name="auth_attempts"> + <ref name="INTEGER"/> + </element> + </optional> + <optional> +  + <element name="auth_time_out"> + <ref name="INTEGER"/> + </element> + </optional> + <optional> +  + <element name="keys_url"> + <text/> + </element> + </optional> + <optional> +  + <element name="enable_services"> + <ref name="BOOLEAN"/> + </element> + </optional> + <optional> +  +  + <element name="pillar_root"> + <text/> + </element> + </optional> + <optional> +  + <element name="pillar_url"> + <text/> + </element> + </optional> + <optional> +  + <element name="formulas_roots"> + <ref name="LIST"/> + <oneOrMore> + <element name="formulas_root"> + <text/> + </element> + </oneOrMore> + </element> + </optional> + <optional> +  + <element name="states_roots"> + <ref name="LIST"/> + <oneOrMore> + <element name="states_root"> + <text/> + </element> + </oneOrMore> + </element> + </optional> + <optional> +  + <element name="states_url"> + <text/> + </element> + </optional> + <optional> +  + <element name="enabled_states"> + <ref name="LIST"/> + <oneOrMore> + <element name="state"> + <text/> + </element> + </oneOrMore> + </element> + </optional> + <optional> +  +  + <element name="modules_url"> + <text/> + </element> + </optional> + </interleave> + </element> + </define>  <define name="productDefines_elements"> <interleave> @@ -2268,6 +2373,9 @@ <zeroOrMore> <ref name="system_roles"/> </zeroOrMore> + <optional> + <ref name="configuration_management"/> + </optional> </interleave> </define> <start> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-4.1.4/package/yast2-installation-control.changes new/yast2-installation-control-4.1.6/package/yast2-installation-control.changes --- old/yast2-installation-control-4.1.4/package/yast2-installation-control.changes 2018-11-22 11:01:23.000000000 +0100 +++ new/yast2-installation-control-4.1.6/package/yast2-installation-control.changes 2018-12-18 13:48:32.000000000 +0100 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Mon Dec 17 12:08:31 UTC 2018 - igonzalezsosa(a)suse.com + +- Add a configuration_management section (fate#322722). +- 4.1.6 + +------------------------------------------------------------------- +Fri Dec 14 11:50:09 UTC 2018 - dgonzalez(a)suse.com + +- Add macros related to skelcd (fate#325482) +- 4.1.5 + +------------------------------------------------------------------- Wed Nov 21 17:41:10 UTC 2018 - Stefan Hundhammer <shundhammer(a)suse.com> - Added global parameter enable_local_users (Fate#326447) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-4.1.4/package/yast2-installation-control.spec new/yast2-installation-control-4.1.6/package/yast2-installation-control.spec --- old/yast2-installation-control-4.1.4/package/yast2-installation-control.spec 2018-11-22 11:01:23.000000000 +0100 +++ new/yast2-installation-control-4.1.6/package/yast2-installation-control.spec 2018-12-18 13:48:32.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation-control -Version: 4.1.4 +Version: 4.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,6 +49,8 @@ %dir %{yast_controldir} %{yast_controldir}/*.rng %{yast_controldir}/*.rnc +%dir /etc/rpm +/etc/rpm/macros.skelcd %license COPYING %doc %{yast_docdir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-4.1.4/rpm/Makefile.am new/yast2-installation-control-4.1.6/rpm/Makefile.am --- old/yast2-installation-control-4.1.4/rpm/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-control-4.1.6/rpm/Makefile.am 2018-12-18 13:48:32.000000000 +0100 @@ -0,0 +1,5 @@ +rpmdir = /etc/rpm + +rpm_DATA = macros.skelcd + +include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-4.1.4/rpm/macros.skelcd new/yast2-installation-control-4.1.6/rpm/macros.skelcd --- old/yast2-installation-control-4.1.4/rpm/macros.skelcd 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-control-4.1.6/rpm/macros.skelcd 2018-12-18 13:48:32.000000000 +0100 @@ -0,0 +1 @@ +%skelcd_control_datadir %{_datadir}/installation-products

1 0

commit yast2-installation for openSUSE:Factory
by root 31 Dec '18

31 Dec '18

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2018-12-31 09:44:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Mon Dec 31 09:44:14 2018 rev:414 rq:658942 version:4.1.34 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2018-11-10 16:49:46.632462820 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new.28833/yast2-installation.changes 2018-12-31 09:44:15.886321007 +0100 @@ -1,0 +2,69 @@ +Mon Dec 17 09:03:47 UTC 2018 - jlopez(a)suse.com + +- Hardening commands execution (part of bsc#1118291). +- Replace backticks by Yast::Execute. +- 4.1.34 + +------------------------------------------------------------------- +Wed Dec 12 15:26:26 UTC 2018 - Josef Reidinger <jreidinger(a)suse.com> + +- always use absolute path to binaries (bsc#1118291) +- properly escape shell arguments (bsc#1118291) +- 4.1.33 + +------------------------------------------------------------------- +Fri Dec 7 14:45:24 UTC 2018 - lslezak(a)suse.cz + +- More aggresive inst-sys cleaner, clean the libzypp cache + when running in graphical mode with less than 1GB RAM + (in text mode keep the current limit 640MB), this avoids + crashes on low memory systems (bsc#1118643) +- Also adapted the computing the default y2log size - use + smaller size in low memory systems, on the other hand limit the + maximum size to avoid huge log files +- 4.1.32 + +------------------------------------------------------------------- +Thu Dec 6 12:59:03 UTC 2018 - lslezak(a)suse.cz + +- Improved saving y2logs during installation to use the /mnt/tmp + space instead of the RAM disk to avoid possible crash (out of + memory) (bsc#1118643) +- 4.1.31 + +------------------------------------------------------------------- +Sat Nov 24 19:40:43 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org> + +- Provide icon with module (boo#1109310) +- 4.1.30 + +------------------------------------------------------------------- +Wed Nov 21 17:42:44 UTC 2018 - Stefan Hundhammer <shundhammer(a)suse.com> + +- Documented new control.xml global parameter enable_local_users + (Fate#326447) +- Improved English in the documentation of control.xml +- 4.1.29 + +------------------------------------------------------------------- +Fri Nov 16 11:06:36 UTC 2018 - igonzalezsosa(a)suse.com + +- Prefer fbiterm whenever is possible for textmode installation + (fate#325746). +- 4.1.28 + +------------------------------------------------------------------- +Thu Nov 15 15:40:49 CET 2018 - schubi(a)suse.de + +- Dialog complex_welcome: Translate the help button if the language + has been changed (bsc#1098571). +- 4.1.27 + +------------------------------------------------------------------- +Mon Nov 12 14:51:30 CET 2018 - schubi(a)suse.de + +- Moving driver_update2_finish call just before unmounting system. + (bnc#967103). +- 4.1.26 + +------------------------------------------------------------------- Old: ---- yast2-installation-4.1.25.tar.bz2 New: ---- yast2-installation-4.1.34.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.pnyvfU/_old 2018-12-31 09:44:16.326320647 +0100 +++ /var/tmp/diff_new_pack.pnyvfU/_new 2018-12-31 09:44:16.330320643 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 4.1.25 +Version: 4.1.34 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -43,9 +43,9 @@ BuildRequires: rubygem(rspec) BuildRequires: rubygem(yast-rake) -# Yast2::Systemd::Service -BuildRequires: yast2 >= 4.1.3 -Requires: yast2 >= 4.1.3 +# Yast::Execute.stdout +BuildRequires: yast2 >= 4.1.42 +Requires: yast2 >= 4.1.42 # Y2Packager::SelfUpdateAddonRepo BuildRequires: yast2-packager >= 4.1.5 @@ -255,5 +255,6 @@ %license COPYING %doc %{yast_docdir}/README.md %doc %{yast_docdir}/CONTRIBUTING.md +%{yast_icondir} %changelog ++++++ yast2-installation-4.1.25.tar.bz2 -> yast2-installation-4.1.34.tar.bz2 ++++++ ++++ 2529 lines of diff (skipped)

1 0

commit installation-images for openSUSE:Factory
by root 31 Dec '18

31 Dec '18

Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2018-12-31 09:44:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images (Old) and /work/SRC/openSUSE:Factory/.installation-images.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images" Mon Dec 31 09:44:10 2018 rev:61 rq:658912 version:14.403 Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2018-11-26 10:17:44.285913217 +0100 +++ /work/SRC/openSUSE:Factory/.installation-images.new.28833/installation-images.changes 2018-12-31 09:44:11.730324411 +0100 @@ -0,0 +1,92 @@ +------------------------------------------------------------------- +Mon Dec 17 11:39:09 UTC 2018 - snwint(a)suse.com + +- added skelcd-fallbackrepo for SLE_HPC, SLE_RT, and CAASP + +------------------------------------------------------------------- +Mon Dec 17 10:14:32 UTC 2018 - snwint(a)suse.com + +- add skelcd-fallbackrepo-* packages to SLES image + +-------------------------------------------------------------------- +Mon Dec 17 09:16:26 UTC 2018 - snwint(a)suse.de + +- merge gh#openSUSE/installation-images#286 +- allow adding package files to inst-sys (fate#325482) +- add skelcd-fallbackrepo packages to instsys +- 14.403 + +-------------------------------------------------------------------- +Wed Dec 12 14:40:32 UTC 2018 - snwint(a)suse.de + +- merge gh#openSUSE/installation-images#285 +- check font config (bsc#1113164) +- add missing Source Sans Pro fonts (bsc#1113164) +- add not always all skelcd-control packages +- fix style issue in check_fonts +- add check_fonts script (and other stuff) +- 14.402 + +------------------------------------------------------------------- +Wed Dec 12 14:39:53 UTC 2018 - snwint(a)suse.com + +- use adobe-sourcesanspro-fonts on openSUSE + +-------------------------------------------------------------------- +Tue Dec 11 13:06:12 UTC 2018 - snwint(a)suse.de + +- merge gh#openSUSE/installation-images#284 +- add all available skelcd-control packages to inst-sys (fate#325482) +- 14.401 + +-------------------------------------------------------------------- +Tue Dec 11 12:44:55 UTC 2018 - snwint(a)suse.de + +- merge gh#openSUSE/installation-images#283 +- support adding packages matching a regexp (fate#325482) +- minor correction +- 14.400 + +-------------------------------------------------------------------- +Mon Dec 10 12:12:45 UTC 2018 - snwint(a)suse.de + +- merge gh#openSUSE/installation-images#282 +- Do not set Y2MAXLOGSIZE and Y2MAXLOGNUM in YaST debug mode + (bsc#1118643) +- 14.399 + +-------------------------------------------------------------------- +Wed Dec 5 10:58:24 UTC 2018 - snwint(a)suse.de + +- merge gh#openSUSE/installation-images#281 +- no longer block hicolor-icon-theme (bsc#1118410) +- 14.398 + +-------------------------------------------------------------------- +Tue Dec 4 10:16:31 UTC 2018 - snwint(a)suse.de + +- merge gh#openSUSE/installation-images#280 +- s390x: adjust rexx sample script (bsc#1108089, bsc#1108090) +- 14.397 + +-------------------------------------------------------------------- +Mon Dec 3 15:07:16 UTC 2018 - lslezak(a)suse.cz + +- merge gh#openSUSE/installation-images#279 +- YaST theme cleanup (related to boo#1109310) +- 14.396 + +-------------------------------------------------------------------- +Mon Dec 3 12:49:03 UTC 2018 - opensuse-packaging(a)opensuse.org + +- merge gh#openSUSE/installation-images#277 +- Add udftools package (fate#326877) +- 14.395 + +-------------------------------------------------------------------- +Mon Dec 3 12:00:33 UTC 2018 - snwint(a)suse.de + +- merge gh#openSUSE/installation-images#278 +- re-enable ssh root login to installation system (bsc#1118114) +- 14.394 + Old: ---- installation-images-14.393.tar.xz New: ---- installation-images-14.403.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.YEWMYs/_old 2018-12-31 09:44:12.342323910 +0100 +++ /var/tmp/diff_new_pack.YEWMYs/_new 2018-12-31 09:44:12.346323907 +0100 @@ -119,6 +119,7 @@ %define branding_grub2 openSUSE %define branding_gfxboot openSUSE BuildRequires: openSUSE-release +BuildRequires: adobe-sourcesanspro-fonts %endif %if "%theme" == "Kubic" @@ -130,6 +131,7 @@ %define branding_gfxboot openSUSE %define config_bootmenu_no_upgrade 1 BuildRequires: openSUSE-Tumbleweed-Kubic-release +BuildRequires: adobe-sourcesanspro-fonts %endif %if "%theme" == "SLED" @@ -149,6 +151,13 @@ %define branding_plymouth SLE %define branding_grub2 SLE %define branding_gfxboot SLE +BuildRequires: skelcd-fallbackrepo-SLES +BuildRequires: skelcd-fallbackrepo-SLED +%ifarch %ix86 +BuildRequires: skelcd-fallbackrepo-SLES_SAP +BuildRequires: skelcd-fallbackrepo-SLE_HPC +BuildRequires: skelcd-fallbackrepo-SLE_RT +%endif BuildRequires: unified-installer-release %endif @@ -170,6 +179,7 @@ %define branding_grub2 SLE %define branding_gfxboot SLE %define config_bootmenu_no_upgrade 1 +BuildRequires: skelcd-fallbackrepo-CAASP BuildRequires: caasp-release %endif @@ -390,6 +400,7 @@ BuildRequires: tcpd-devel BuildRequires: termcap BuildRequires: terminfo +BuildRequires: udftools BuildRequires: un-fonts BuildRequires: usbutils BuildRequires: util-linux @@ -541,7 +552,7 @@ Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.393 +Version: 14.403 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images) ++++++ installation-images-14.393.tar.xz -> installation-images-14.403.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.393/VERSION new/installation-images-14.403/VERSION --- old/installation-images-14.393/VERSION 2018-11-20 13:21:51.000000000 +0100 +++ new/installation-images-14.403/VERSION 2018-12-17 10:16:26.000000000 +0100 @@ -1 +1 @@ -14.393 +14.403 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.393/changelog new/installation-images-14.403/changelog --- old/installation-images-14.393/changelog 2018-11-20 13:21:51.000000000 +0100 +++ new/installation-images-14.403/changelog 2018-12-17 10:16:26.000000000 +0100 @@ -1,3 +1,43 @@ +2018-12-14: 14.403 + - add skelcd-fallbackrepo packages to instsys + - allow adding package files to inst-sys (fate #325482) + +2018-12-12: 14.402 + - fix style issue in check_fonts + - add not always all skelcd-control packages + - add missing Source Sans Pro fonts (bsc #1113164) + - check font config (bsc #1113164) + - add check_fonts script + +2018-12-11: 14.401 + - add all available skelcd-control packages to inst-sys (fate #325482) + +2018-12-11: 14.400 + - minor correction + - support adding packages matching a regexp (fate #325482) + +2018-12-10: 14.399 + - Do not set Y2MAXLOGSIZE and Y2MAXLOGNUM in YaST debug mode (bsc #1118643) + +2018-12-05: 14.398 + - no longer block hicolor-icon-theme (bsc #1118410) + +2018-12-04: 14.397 + - s390x: adjust rexx sample script (bsc #1108089, bsc #1108090) + +2018-12-03: 14.396 + - YaST theme cleanup (related to boo#1109310) + - Do not create the /usr/share/YaST2/theme/current symlink, + it's not needed anymore, the path exists and is a directory. + - Removed the related settings from the theme config and + the documentation. + +2018-12-03: 14.395 + - Add udftools package (fate #326877) + +2018-12-03: 14.394 + - re-enable ssh root login to installation system (bsc #1118114) + 2018-11-19: 14.393 - rescue: change service name of nfsserver to nfs-server diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.393/data/base/base.file_list new/installation-images-14.403/data/base/base.file_list --- old/installation-images-14.393/data/base/base.file_list 2018-11-20 13:21:51.000000000 +0100 +++ new/installation-images-14.403/data/base/base.file_list 2018-12-17 10:16:26.000000000 +0100 @@ -148,6 +148,7 @@ x unused_mos bin/unused_mos x mlist3 bin/mlist3 x default_repo bin/default_repo +x check_fonts bin/check_fonts # create locale x create_locale /create_locale diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.393/data/base/check_fonts new/installation-images-14.403/data/base/check_fonts --- old/installation-images-14.393/data/base/check_fonts 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-14.403/data/base/check_fonts 2018-12-17 10:16:26.000000000 +0100 @@ -0,0 +1,44 @@ +#! /usr/bin/perl + +# usage: check_fonts DIR +# +# Scan DIR for *.css and *.qss files (recursively), extract font families +# and check if they are available. +# +# Exit code is 0 if everything is fine, else 1. + +use strict; +use File::Find; + +# We need '.' as the script runs in a somewhat peculiar setup where fc-match +# will not be available at the usual place. +$ENV{PATH} = "/usr/bin:/bin/:/usr/sbin:/sbin:."; + +my $dir = shift || "."; +my $error = 0; +my $fonts; + +File::Find::find({ + wanted => sub { + if(/\.[cq]ss$/) { + if(open my $f, $_) { + map { $fonts->{$2 || $3} = 1 if /\bfont-family:\s*("([^"]+)"|([^\s,;]+))/ } <$f>; + close $f; + } + } + }, + no_chdir => 1 +}, $dir); + +for my $font (sort keys %$fonts) { + my $match = `fc-match -f '%{family},%{fullname}' '$font'`; + exit 1 if $?; + my %matches; + $matches{$_} = 1 for split /,/, $match; + if(!$matches{$font}) { + $error = 1; + print "Error: font \"$font\" not found; closest match(es): \"", join('", "', sort keys %matches), "\"\n"; + } +} + +exit $error; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.393/data/initrd/s390/sles.exec new/installation-images-14.403/data/initrd/s390/sles.exec --- old/installation-images-14.393/data/initrd/s390/sles.exec 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-14.403/data/initrd/s390/sles.exec 2018-12-17 10:16:26.000000000 +0100 @@ -0,0 +1,11 @@ +/* REXX LOAD EXEC FOR SUSE LINUX S/390 VM GUESTS */ +/* LOADS SUSE LINUX S/390 FILES INTO READER */ +SAY '' +SAY 'LOADING SLES FILES INTO READER...' +'CP CLOSE RDR' +'PURGE RDR ALL' +'SPOOL PUNCH * RDR' +'PUNCH SLES LINUX A (NOH' +'PUNCH SLES PARMFILE A (NOH' +'PUNCH SLES INITRD A (NOH' +'IPL 00C' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.393/data/initrd/s390/sles12.exec new/installation-images-14.403/data/initrd/s390/sles12.exec --- old/installation-images-14.393/data/initrd/s390/sles12.exec 2018-11-20 13:21:51.000000000 +0100 +++ new/installation-images-14.403/data/initrd/s390/sles12.exec 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -/* REXX LOAD EXEC FOR SUSE LINUX S/390 VM GUESTS */ -/* LOADS SUSE LINUX S/390 FILES INTO READER */ -SAY '' -SAY 'LOADING SLES12 FILES INTO READER...' -'CP CLOSE RDR' -'PURGE RDR ALL' -'SPOOL PUNCH * RDR' -'PUNCH SLES12 LINUX A (NOH' -'PUNCH SLES12 PARMFILE A (NOH' -'PUNCH SLES12 INITRD A (NOH' -'IPL 00C' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.393/data/rescue/rescue.file_list new/installation-images-14.403/data/rescue/rescue.file_list --- old/installation-images-14.393/data/rescue/rescue.file_list 2018-11-20 13:21:51.000000000 +0100 +++ new/installation-images-14.403/data/rescue/rescue.file_list 2018-12-17 10:16:26.000000000 +0100 @@ -328,6 +328,8 @@ d /etc/sysconfig t /etc/sysconfig/ssh E prein + # enable root login bsc#1118114 + R s/^\s*#\s*(PermitRootLogin)\b.*/$1 yes/ /etc/ssh/sshd_config ?ia32el: /etc/init.d/ia32el diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.393/data/root/etc/inst_setup new/installation-images-14.403/data/root/etc/inst_setup --- old/installation-images-14.393/data/root/etc/inst_setup 2018-11-20 13:21:51.000000000 +0100 +++ new/installation-images-14.403/data/root/etc/inst_setup 2018-12-17 10:16:26.000000000 +0100 @@ -151,8 +151,6 @@ # for yast debugging. if grep -iwq y2debug < /proc/cmdline ; then export Y2DEBUG=1 - export Y2MAXLOGSIZE=50000 - export Y2MAXLOGNUM=5 fi export XCURSOR_THEME=DMZ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.393/data/root/root.file_list new/installation-images-14.403/data/root/root.file_list --- old/installation-images-14.393/data/root/root.file_list 2018-11-20 13:21:51.000000000 +0100 +++ new/installation-images-14.403/data/root/root.file_list 2018-12-17 10:16:26.000000000 +0100 @@ -98,7 +98,6 @@ kmod: ignore kmod-compat: ignore gio-branding-upstream: ignore -hicolor-icon-theme: ignore yast2-trans-allpacks: ignore udev: ignore unzip: ignore @@ -180,6 +179,7 @@ systemd-presets-branding-<systemd_theme>: systemd-sysvinit: systemd: +udftools: usbutils: util-linux: wget: @@ -194,6 +194,8 @@ python2-websockify: ignore python3-setuptools: ignore +add_all skelcd-fallbackrepo-.*: + python3-websockify: / # avoid update-alternatives @@ -537,6 +539,9 @@ fbiterm: /usr/bin/fbiterm +?adobe-sourcesanspro-fonts: + /usr/share/fonts/truetype/SourceSansPro-{Regular,Light,Semibold}.otf + dejavu-fonts: /usr/share/fonts/truetype/DejaVuSans*.ttf r /usr/share/fonts/truetype/DejaVuSansCondensed* @@ -635,6 +640,8 @@ / t /etc/sysconfig/ssh E prein + # enable root login bsc#1118114 + R s/^\s*#\s*(PermitRootLogin)\b.*/$1 yes/ /etc/ssh/sshd_config fonts-config: / @@ -660,11 +667,6 @@ : -# set yast theme -if theme ne 'openSUSE' - s <yast_theme> usr/share/YaST2/theme/current -endif - x etc/suse-post-user.conf etc/fonts/ e mkfontscale usr/share/fonts/misc @@ -745,6 +747,11 @@ # zypp config is in initrd r /etc/zypp +# check font config +e cp /bin/check_fonts /usr/bin/fc-match . +E /check_fonts usr/share/YaST2/theme +e rm check_fonts fc-match + # allowed dangling symlinks D ../../sbin/update-ca-certificates /usr/lib64/p11-kit/p11-kit-extract-trust D ../../sbin/update-ca-certificates /usr/lib/p11-kit/p11-kit-extract-trust diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.393/doc/branding.md new/installation-images-14.403/doc/branding.md --- old/installation-images-14.393/doc/branding.md 2018-11-20 13:21:51.000000000 +0100 +++ new/installation-images-14.403/doc/branding.md 2018-12-17 10:16:26.000000000 +0100 @@ -14,7 +14,6 @@ grub2 = SLE # grub2-branding-SLE.rpm plymouth = SLE # plymouth-branding-SLE.rpm systemd = SLE # systemd-presets-branding-SLE.rpm -yast = SLE # yast2-theme-SLE.rpm ``` Then add an appropriate theme section to `installation-images.spec`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.393/doc/files.md new/installation-images-14.403/doc/files.md --- old/installation-images-14.393/doc/files.md 2018-11-20 13:21:51.000000000 +0100 +++ new/installation-images-14.403/doc/files.md 2018-12-17 10:16:26.000000000 +0100 @@ -170,6 +170,24 @@ systemd: ignore ``` +### Including packages matching a regexp + +To include a group of packages matching a regexp, use `add_all`: + +``` +add_all PACKAGE_REGEXP: +``` + +Examples: + +``` +add_all skelcd-control-.*: +``` + +Note that you cannot associate any actions to such an entry directly. Use +templates (see below) if you don't want to install the packages as a whole. + + ### Actions Several actions can be specified using the following syntax: @@ -266,6 +284,12 @@ p <patch> ``` +- Copy package file (the rpm itself) to directory. + +``` +P <dir> +``` + - chown/chmod files ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.393/etc/config new/installation-images-14.403/etc/config --- old/installation-images-14.393/etc/config 2018-11-20 13:21:51.000000000 +0100 +++ new/installation-images-14.403/etc/config 2018-12-17 10:16:26.000000000 +0100 @@ -81,19 +81,16 @@ release = openSUSE skelcd = openSUSE skelcd_ctrl = openSUSE -yast = openSUSE gfxboot = openSUSE grub2 = openSUSE plymouth = openSUSE systemd = openSUSE - [Theme SLES] image = 600 release = unified-installer skelcd = sles skelcd_ctrl = leanos -yast = SLE gfxboot = SLE grub2 = SLE plymouth = SLE @@ -104,7 +101,6 @@ release = unified-installer skelcd = sles skelcd_ctrl = leanos -yast = SLE gfxboot = SLE grub2 = SLE plymouth = SLE @@ -115,19 +111,16 @@ release = unified-installer skelcd = sled skelcd_ctrl = leanos -yast = SLE gfxboot = SLE grub2 = SLE plymouth = SLE systemd = SLE - [Theme CAASP] image = 600 release = caasp skelcd = caasp skelcd_ctrl = CAASP -yast = SLE gfxboot = SLE grub2 = SLE plymouth = SLE @@ -138,7 +131,6 @@ release = openSUSE-Tumbleweed-Kubic skelcd = openSUSE skelcd_ctrl = Kubic -yast = openSUSE gfxboot = openSUSE grub2 = openSUSE plymouth = openSUSE @@ -149,9 +141,7 @@ release = unified-installer skelcd = sles skelcd_ctrl = leanos -yast = SLE gfxboot = SLE grub2 = SLE plymouth = SLE systemd = SLE - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.393/install.s390x new/installation-images-14.403/install.s390x --- old/installation-images-14.393/install.s390x 2018-11-20 13:21:51.000000000 +0100 +++ new/installation-images-14.403/install.s390x 2018-12-17 10:16:26.000000000 +0100 @@ -35,7 +35,7 @@ install -m 644 data/initrd/s390/parmfile.hmc $DESTDIR/branding/$theme/CD1/boot/$ARCH/parmfile.hmc install -m 644 data/initrd/s390/parmfile.cd $DESTDIR/branding/$theme/CD1/boot/$ARCH/parmfile.cd - install -m 644 data/initrd/s390/sles12.exec $DESTDIR/branding/$theme/CD1/boot/$ARCH/sles12.exec + install -m 644 data/initrd/s390/sles.exec $DESTDIR/branding/$theme/CD1/boot/$ARCH/sles.exec install -m 644 tmp/base/usr/share/doc/packages/s390-tools/zpxe.rexx $DESTDIR/branding/$theme/CD1/boot/$ARCH/zpxe.rexx # create cd.ikr and remove no longer needed parmfile.cd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.393/lib/AddFiles.pm new/installation-images-14.403/lib/AddFiles.pm --- old/installation-images-14.393/lib/AddFiles.pm 2018-11-20 13:21:51.000000000 +0100 +++ new/installation-images-14.403/lib/AddFiles.pm 2018-12-17 10:16:26.000000000 +0100 @@ -330,6 +330,23 @@ $packs->[-1]{rpmdir} = $rpm_dir; } + elsif(/^add_all\s+(\S+):$/) { + my $pattern = $1; + my $rpms = RealRPMs $pattern; + print "add_all: $pattern = (", join(", ", @$rpms), ")\n"; + for my $p (@$rpms) { + my $rpm_dir = ReadRPM $p; + + next unless $rpm_dir; + + my $entry = {}; + $entry->{name} = RealRPM($p)->{name}; + $entry->{version} = ReadFile "$rpm_dir/version"; + $entry->{rpmdir} = $rpm_dir; + + push @$packs, $entry; + } + } else { push @{$packs->[-1]{tasks}}, { src => $src_line, line => $_ }; } @@ -539,9 +556,12 @@ } } + my $rpm_file; + if($pack->{name} ne '') { + $rpm_file = "$ConfigData{tmp_cache_dir}/.rpms/$pack->{name}.rpm"; + if(exists $pack->{tags}{direct}) { - my $rpm_file = "$ConfigData{tmp_cache_dir}/.rpms/$pack->{name}.rpm"; print "installing package $pack->{name} [$pack->{version}]$all_scripts$by\n"; die "$rpm_file: rpm file missing" unless -r $rpm_file; my $abs_dir = File::Spec->rel2abs($dir); @@ -670,6 +690,15 @@ SUSystem "patch -d $dir -p0 --no-backup-if-mismatch <$ext_dir/$1" and warn "$Script: failed to apply patch $1"; } + elsif(/^P\s+(\S+)$/) { + if($rpm_file && -r $rpm_file) { + SUSystem "cp -L $rpm_file $dir/$1 2>/dev/null" and + warn "$Script: failed to copy rpm to $1"; + } + else { + warn "$Script: no package file"; + } + } elsif(/^A\s+(\S+)\s+(\S+)$/) { SUSystem "sh -c 'cat $ext_dir/$1 >>$dir/$2'" and warn "$Script: failed to append $1 to $2"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.393/lib/ReadConfig.pm new/installation-images-14.403/lib/ReadConfig.pm --- old/installation-images-14.393/lib/ReadConfig.pm 2018-11-20 13:21:51.000000000 +0100 +++ new/installation-images-14.403/lib/ReadConfig.pm 2018-12-17 10:16:26.000000000 +0100 @@ -165,7 +165,7 @@ @ISA = qw ( Exporter ); @EXPORT = qw ( $Script $BasePath $LibPath $BinPath $CfgPath $ImagePath $DataPath - $TmpBase %ConfigData ReadFile RealRPM ReadRPM $SUBinary SUSystem Print2File $MToolsCfg $AutoBuild + $TmpBase %ConfigData ReadFile RealRPM RealRPMs ReadRPM $SUBinary SUSystem Print2File $MToolsCfg $AutoBuild ResolveDeps ); @@ -322,6 +322,31 @@ } +# Return list of RPMs matching (regexp) pattern. The list is empty if no +# match was found. +# +sub RealRPMs +{ + my $pattern = shift; + my @packages; + + if($ConfigData{obs}) { + # running outside obs + @packages = @{$ConfigData{packages}}; + # entries in ConfigData are "PACKAGE PROJECT", remove the PROJECT part + map { s/\s.*$// } @packages; + } + else { + # running in an obs build + @packages = <$ConfigData{suse_base}/*.rpm>; + # remove superfluous file name parts + map { s#^.*/|\.rpm$##g } @packages; + } + + return [ grep { /^$pattern$/ } @packages ]; +} + + # # 'rpm' is hash as returned from RealRPM(). #

1 0

commit yast2-add-on for openSUSE:Factory
by root 31 Dec '18

31 Dec '18

Hello community, here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at 2018-12-31 09:44:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old) and /work/SRC/openSUSE:Factory/.yast2-add-on.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-add-on" Mon Dec 31 09:44:06 2018 rev:96 rq:658874 version:4.1.10 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes 2018-11-01 18:56:09.973972136 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-add-on.new.28833/yast2-add-on.changes 2018-12-31 09:44:07.718327697 +0100 @@ -1,0 +2,20 @@ +Fri Dec 14 17:13:20 UTC 2018 - lslezak(a)suse.cz + +- Fixed displaying previous dialog content when going back and + forth in the installation workflow (bsc#1117492) +- 4.1.10 + +------------------------------------------------------------------- +Fri Nov 23 17:08:05 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org> + +- Provide icon with module (boo#1109310) +- 4.1.9 + +------------------------------------------------------------------- +Tue Nov 20 11:10:09 CET 2018 - schubi(a)suse.de + +- Function SelectProduct removed in order NOT to select All + available products (bsc#1116332). +- 4.1.8 + +------------------------------------------------------------------- Old: ---- yast2-add-on-4.1.7.tar.bz2 New: ---- yast2-add-on-4.1.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.MSugCj/_old 2018-12-31 09:44:08.078327402 +0100 +++ /var/tmp/diff_new_pack.MSugCj/_new 2018-12-31 09:44:08.078327402 +0100 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 4.1.7 +Version: 4.1.10 Release: 0 Summary: YaST2 - Add-On media installation code License: GPL-2.0-only @@ -71,6 +71,7 @@ %{yast_clientdir}/vendor.rb %{yast_desktopdir}/*.desktop %{yast_schemadir}/autoyast/rnc/add-on.rnc +%{_datadir}/icons/* %dir %{yast_docdir} %license COPYING %doc %{yast_docdir}/CONTRIBUTING.md ++++++ yast2-add-on-4.1.7.tar.bz2 -> yast2-add-on-4.1.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.1.7/package/yast2-add-on.changes new/yast2-add-on-4.1.10/package/yast2-add-on.changes --- old/yast2-add-on-4.1.7/package/yast2-add-on.changes 2018-10-16 17:42:40.000000000 +0200 +++ new/yast2-add-on-4.1.10/package/yast2-add-on.changes 2018-12-17 10:42:55.000000000 +0100 @@ -1,4 +1,24 @@ ------------------------------------------------------------------- +Fri Dec 14 17:13:20 UTC 2018 - lslezak(a)suse.cz + +- Fixed displaying previous dialog content when going back and + forth in the installation workflow (bsc#1117492) +- 4.1.10 + +------------------------------------------------------------------- +Fri Nov 23 17:08:05 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org> + +- Provide icon with module (boo#1109310) +- 4.1.9 + +------------------------------------------------------------------- +Tue Nov 20 11:10:09 CET 2018 - schubi(a)suse.de + +- Function SelectProduct removed in order NOT to select All + available products (bsc#1116332). +- 4.1.8 + +------------------------------------------------------------------- Tue Oct 16 13:17:31 CEST 2018 - schubi(a)suse.de - Fixed path to license file. . Build error in bsc#1108139. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.1.7/package/yast2-add-on.spec new/yast2-add-on-4.1.10/package/yast2-add-on.spec --- old/yast2-add-on-4.1.7/package/yast2-add-on.spec 2018-10-16 17:42:40.000000000 +0200 +++ new/yast2-add-on-4.1.10/package/yast2-add-on.spec 2018-12-17 10:42:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 4.1.7 +Version: 4.1.10 Release: 0 Summary: YaST2 - Add-On media installation code License: GPL-2.0-only @@ -71,6 +71,7 @@ %{yast_clientdir}/vendor.rb %{yast_desktopdir}/*.desktop %{yast_schemadir}/autoyast/rnc/add-on.rnc +%{_datadir}/icons/* %dir %{yast_docdir} %license COPYING %doc %{yast_docdir}/CONTRIBUTING.md diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.1.7/src/icons/hicolor/scalable/apps/yast-addon.svg new/yast2-add-on-4.1.10/src/icons/hicolor/scalable/apps/yast-addon.svg --- old/yast2-add-on-4.1.7/src/icons/hicolor/scalable/apps/yast-addon.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-add-on-4.1.10/src/icons/hicolor/scalable/apps/yast-addon.svg 2018-12-17 10:42:55.000000000 +0100 @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg version="1.0" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"> +<defs> +<linearGradient id="a" x1="2" x2="30" y1="17" y2="17" gradientTransform="matrix(4,0,0,4,0,170)" gradientUnits="userSpaceOnUse"> +<stop stop-color="#c0bfbc" offset="0"/> +<stop stop-color="#c0bfbc" offset=".14286"/> +<stop stop-color="#deddda" offset=".25"/> +<stop stop-color="#c0bfbc" stop-opacity=".93852" offset=".5"/> +<stop stop-color="#c0bfbc" stop-opacity=".98361" offset="1"/> +</linearGradient> +</defs> +<g transform="translate(0,-172)"> +<path d="m64 182c-30.928 0-56 25.072-56 56s25.072 56 56 56 56-25.072 56-56-25.072-56-56-56zm0 36a20 20 0 0 1 20 20 20 20 0 0 1 -20 20 20 20 0 0 1 -20 -20 20 20 0 0 1 20 -20z" enable-background="new" fill="url(#a)" stroke-width="4"/> +<path d="m64 180c-30.928 0-56 25.072-56 56s25.072 56 56 56 56-25.072 56-56-25.072-56-56-56zm0 36a20 20 0 0 1 20 20 20 20 0 0 1 -20 20 20 20 0 0 1 -20 -20 20 20 0 0 1 20 -20z" enable-background="new" fill="#deddda" stroke-width="4"/> +<path d="m64 216a20 20 0 0 0 -20 20 20 20 0 0 0 20 20 20 20 0 0 0 20 -20 20 20 0 0 0 -20 -20zm0 12a8 8 0 0 1 8 8 8 8 0 0 1 -8 8 8 8 0 0 1 -8 -8 8 8 0 0 1 8 -8z" enable-background="new" fill="#c0bfbc" fill-opacity=".94672" stroke-width="4"/> +<path d="m64 180v36a20 20 0 0 1 14.133 5.8672l25.469-25.469c-10.134-10.134-24.138-16.398-39.602-16.398zm-14.133 70.132-25.469 25.469c10.134 10.134 24.138 16.398 39.602 16.398v-36a20 20 0 0 1 -14.133 -5.8672z" enable-background="new" fill="#f6f5f4" opacity=".5" stroke-width="4"/> +<path d="m64 212a24 24 0 0 0 -24 24 24 24 0 0 0 24 24 24 24 0 0 0 24 -24 24 24 0 0 0 -24 -24zm0 4a20 20 0 0 1 20 20 20 20 0 0 1 -20 20 20 20 0 0 1 -20 -20 20 20 0 0 1 20 -20z" enable-background="new" fill="#9a9996" fill-opacity=".94672" stroke-width="4"/> +<path d="m117.05 250h-14c-3-1-2.9596-1.3681-3-3-0.0518-2.0914 3-4 3-7 0-2.216-1.784-4-4-4h-4c-2.216 0-4 1.784-4 4 0 3 2.914 4.7514 3 7 0.0618 1.6148 0 2-2.8984 3h-16.102v16c-1 3-1.3681 2.9596-3 3-2.0914 0.0518-4-3-7-3-2.216 0-4 1.784-4 4v4c0 2.216 1.784 4 4 4 3 0 4.7514-2.914 7-3 1.6148-0.0618 2 0 3 2.8984v14.102h42v-14.246c-0.95907-2.7399-1.3629-2.8146-2.9473-2.7539-2.2486 0.086-4 3-7 3-2.216 0-4-1.784-4-4v-4c0-2.216 1.784-4 4-4 3 0 4.9086 3.0518 7 3 1.6012-0.0396 1.9887-0.0189 2.9473-2.8516z" enable-background="new" fill="#1a5fb4"/> +<path d="m117 248h-14c-3-1-2.9596-1.3681-3-3-0.0518-2.0914 3-4 3-7 0-2.216-1.784-4-4-4h-4c-2.216 0-4 1.784-4 4 0 3 2.914 4.7514 3 7 0.0618 1.6148 2e-6 2-2.8984 3h-16.102v16c-1 3-1.3681 2.9596-3 3-2.0914 0.0518-4-3-7-3-2.216 0-4 1.784-4 4v4c0 2.216 1.784 4 4 4 3 0 4.7514-2.914 7-3 1.6148-0.0618 2 0 3 2.8984v14.102h42v-14.246c-0.95907-2.7399-1.3629-2.8146-2.9473-2.7539-2.2486 0.086-4 3-7 3-2.216 0-4-1.784-4-4v-4c0-2.216 1.784-4 4-4 3 0 4.9086 3.0518 7 3 1.6012-0.0396 1.9887-0.0189 2.9473-2.8516z" fill="#3584e4"/> +</g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.1.7/src/icons/hicolor/symbolic/apps/yast-addon-symbolic.svg new/yast2-add-on-4.1.10/src/icons/hicolor/symbolic/apps/yast-addon-symbolic.svg --- old/yast2-add-on-4.1.7/src/icons/hicolor/symbolic/apps/yast-addon-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-add-on-4.1.10/src/icons/hicolor/symbolic/apps/yast-addon-symbolic.svg 2018-12-17 10:42:55.000000000 +0100 @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"> + <path d="M 9.7148438 0 C 9.0817007 0 8.5722656 0.50943515 8.5722656 1.1425781 C 8.5722656 1.9997211 9.4031524 2.5001071 9.4277344 3.1425781 C 9.4453944 3.6039501 9.4277354 3.714286 8.5996094 4 L 4 4 L 4 8.5722656 C 3.714286 9.4294076 3.6088271 9.4161894 3.1425781 9.4277344 C 2.5450351 9.4425344 1.9997211 8.5722656 1.1425781 8.5722656 C 0.50943515 8.5722656 0 9.0817007 0 9.7148438 L 0 10.857422 C 0 11.490565 0.50943515 12 1.1425781 12 C 1.9997211 12 2.5001071 11.167161 3.1425781 11.142578 C 3.6039501 11.124918 3.714286 11.142577 4 11.970703 L 4 16 L 10 16 L 10 10 L 12.015625 10 L 12.015625 9.7148438 C 12.015625 9.0817007 12.52506 8.5722656 13.158203 8.5722656 C 14.015346 8.5722656 14.560657 9.4425344 15.158203 9.4277344 C 15.615691 9.4164204 15.72612 9.4226124 16 8.6132812 L 16 4 L 12 4 C 11.142857 3.714286 11.154124 3.6088271 11.142578 3.1425781 C 11.127778 2.5450351 12 1.9997211 12 1.1425781 C 12 0.50943515 11.490565 0 10.857422 0 L 9.7148438 0 z M 11 11 L 11 16 L 16 16 L 16 11 L 11 11 z M 12 12 L 13 12 L 13 13 L 14 13 L 14 12 L 15 12 L 15 14 L 14 14 L 14 15 L 13 15 L 13 14 L 12 14 L 12 12 z " fill="#c0bfbc" /> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.1.7/src/include/add-on/add-on-workflow.rb new/yast2-add-on-4.1.10/src/include/add-on/add-on-workflow.rb --- old/yast2-add-on-4.1.7/src/include/add-on/add-on-workflow.rb 2018-10-16 17:42:40.000000000 +0200 +++ new/yast2-add-on-4.1.10/src/include/add-on/add-on-workflow.rb 2018-12-17 10:42:55.000000000 +0100 @@ -847,7 +847,7 @@ Wizard.HideBackButton if !enable_back Wizard.HideAbortButton if !enable_abort - Wizard.SetTitleIcon("yast-addon") + Wizard.SetDesktopIcon("add-on") # disable delete button if no items listed # bug #203809 @@ -1021,13 +1021,8 @@ # because of CD/DVD + url cd:// Pkg.SourceReleaseAll - # bugzilla #305788 - # Use new wizard window for adding new Add-On. - # Do not use "Steps" dialog. - Wizard.OpenLeftTitleNextBackDialog Wizard.SetTitleIcon("yast-addon") ret2 = RunWizard() - Wizard.CloseDialog log.info "Subworkflow result: ret2: #{ret2}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.1.7/src/lib/add-on/clients/inst_add-on.rb new/yast2-add-on-4.1.10/src/lib/add-on/clients/inst_add-on.rb --- old/yast2-add-on-4.1.7/src/lib/add-on/clients/inst_add-on.rb 2018-10-16 17:42:40.000000000 +0200 +++ new/yast2-add-on-4.1.10/src/lib/add-on/clients/inst_add-on.rb 2018-12-17 10:42:55.000000000 +0100 @@ -45,8 +45,6 @@ @argmap = GetInstArgs.argmap - Packages.SelectProduct - PackageCallbacks.SetMediaCallbacks # add add-ons specified on the kernel command line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.1.7/test/test_helper.rb new/yast2-add-on-4.1.10/test/test_helper.rb --- old/yast2-add-on-4.1.7/test/test_helper.rb 2018-10-16 17:42:40.000000000 +0200 +++ new/yast2-add-on-4.1.10/test/test_helper.rb 2018-12-17 10:42:55.000000000 +0100 @@ -18,6 +18,9 @@ # Stub classes from other modules to speed up a build stub_module("AutoinstGeneral") stub_module("AutoinstSoftware") +# the SuSEFirewall module checks the firewall status in the constructor, +# avoid displaying a PolicyKit popup asking for the root password... +stub_module("SuSEFirewall") if ENV["COVERAGE"] require "simplecov" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.1.7/test/y2add_on/clients/inst_add-on_test.rb new/yast2-add-on-4.1.10/test/y2add_on/clients/inst_add-on_test.rb --- old/yast2-add-on-4.1.7/test/y2add_on/clients/inst_add-on_test.rb 2018-10-16 17:42:40.000000000 +0200 +++ new/yast2-add-on-4.1.10/test/y2add_on/clients/inst_add-on_test.rb 2018-12-17 10:42:55.000000000 +0100 @@ -14,7 +14,6 @@ let(:add_on_selected) { false } before do - allow(Yast::Packages).to receive(:SelectProduct) allow(Yast::Linuxrc).to receive(:InstallInf).with("addon").and_return(addons) allow(subject).to receive(:NetworkSetupForAddons).and_return(:next) allow(subject).to receive(:InstallProduct)

1 0

commit yast2-registration for openSUSE:Factory
by root 31 Dec '18

31 Dec '18

Hello community, here is the log from the commit of package yast2-registration for openSUSE:Factory checked in at 2018-12-31 09:44:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-registration (Old) and /work/SRC/openSUSE:Factory/.yast2-registration.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration" Mon Dec 31 09:44:01 2018 rev:27 rq:658051 version:4.1.11 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-registration/yast2-registration.changes 2018-11-22 13:24:40.550053139 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-registration.new.28833/yast2-registration.changes 2018-12-31 09:44:03.346331278 +0100 @@ -1,0 +2,20 @@ +Fri Dec 14 13:14:15 UTC 2018 - jlopez(a)suse.com + +- Hardening commands execution (part of bsc#1118291). +- Replace backticks by Yast::Execute. +- 4.1.11 + +------------------------------------------------------------------- +Fri Dec 14 09:41:49 UTC 2018 - lslezak(a)suse.cz + +- Fixed UI display issue in the installation workflow + (not cleared screen) (bsc#1117492) +- 4.1.10 + +------------------------------------------------------------------- +Mon Nov 26 01:17:32 UTC 2018 - Noah Davis <noahadvs(a)gmail.com> + +- Provide icon with module (boo#1109310) +- 4.1.9 + +------------------------------------------------------------------- Old: ---- yast2-registration-4.1.8.tar.bz2 New: ---- yast2-registration-4.1.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.3JLkPe/_old 2018-12-31 09:44:03.994330747 +0100 +++ /var/tmp/diff_new_pack.3JLkPe/_new 2018-12-31 09:44:03.998330744 +0100 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 4.1.8 +Version: 4.1.11 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -98,6 +98,7 @@ %{yast_libdir}/registration %{yast_libdir}/yast %{yast_libdir}/yast/suse_connect.rb +%{yast_icondir} %doc %{yast_docdir} %license COPYING ++++++ yast2-registration-4.1.8.tar.bz2 -> yast2-registration-4.1.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.1.8/package/yast2-registration.changes new/yast2-registration-4.1.11/package/yast2-registration.changes --- old/yast2-registration-4.1.8/package/yast2-registration.changes 2018-11-21 17:44:29.000000000 +0100 +++ new/yast2-registration-4.1.11/package/yast2-registration.changes 2018-12-14 14:25:06.000000000 +0100 @@ -1,4 +1,24 @@ ------------------------------------------------------------------- +Fri Dec 14 13:14:15 UTC 2018 - jlopez(a)suse.com + +- Hardening commands execution (part of bsc#1118291). +- Replace backticks by Yast::Execute. +- 4.1.11 + +------------------------------------------------------------------- +Fri Dec 14 09:41:49 UTC 2018 - lslezak(a)suse.cz + +- Fixed UI display issue in the installation workflow + (not cleared screen) (bsc#1117492) +- 4.1.10 + +------------------------------------------------------------------- +Mon Nov 26 01:17:32 UTC 2018 - Noah Davis <noahadvs(a)gmail.com> + +- Provide icon with module (boo#1109310) +- 4.1.9 + +------------------------------------------------------------------- Wed Nov 21 16:39:02 CET 2018 - schubi(a)suse.de - Do not allow redirection while checking via HTTP request if diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.1.8/package/yast2-registration.spec new/yast2-registration-4.1.11/package/yast2-registration.spec --- old/yast2-registration-4.1.8/package/yast2-registration.spec 2018-11-21 17:44:29.000000000 +0100 +++ new/yast2-registration-4.1.11/package/yast2-registration.spec 2018-12-14 14:25:06.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 4.1.8 +Version: 4.1.11 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -99,6 +99,7 @@ %{yast_libdir}/registration %{yast_libdir}/yast %{yast_libdir}/yast/suse_connect.rb +%{yast_icondir} %doc %{yast_docdir} %license COPYING diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.1.8/src/desktop/add_extensions.desktop new/yast2-registration-4.1.11/src/desktop/add_extensions.desktop --- old/yast2-registration-4.1.8/src/desktop/add_extensions.desktop 2018-11-21 17:44:29.000000000 +0100 +++ new/yast2-registration-4.1.11/src/desktop/add_extensions.desktop 2018-12-14 14:25:06.000000000 +0100 @@ -8,7 +8,7 @@ X-SuSE-YaST-Group=Software X-SuSE-YaST-Keywords=extensions,modules,software,registration,scc,package,repositories -Icon=yast-addon +Icon=yast-addon-extension Exec=/usr/bin/xdg-su -c "/sbin/yast2 scc select_extensions" Name=Add System Extensions or Modules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.1.8/src/icons/hicolor/scalable/apps/yast-addon-extension.svg new/yast2-registration-4.1.11/src/icons/hicolor/scalable/apps/yast-addon-extension.svg --- old/yast2-registration-4.1.8/src/icons/hicolor/scalable/apps/yast-addon-extension.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-4.1.11/src/icons/hicolor/scalable/apps/yast-addon-extension.svg 2018-12-14 14:25:06.000000000 +0100 @@ -0,0 +1 @@ +<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="8" x2="120" y1="238" y2="238"><stop offset="0" stop-color="#c0bfbc"/><stop offset=".143" stop-color="#c0bfbc"/><stop offset=".25" stop-color="#deddda"/><stop offset=".5" stop-color="#c0bfbc" stop-opacity=".939"/><stop offset="1" stop-color="#c0bfbc" stop-opacity=".984"/></linearGradient><g stroke-width="4"><path d="M64 182c-30.928 0-56 25.072-56 56s25.072 56 56 56 56-25.072 56-56-25.072-56-56-56zm0 36a20 20 0 0 1 20 20 20 20 0 0 1-20 20 20 20 0 0 1-20-20 20 20 0 0 1 20-20z" fill="url(#a)" transform="translate(0 -172)"/><path d="M64 8C33.072 8 8 33.072 8 64s25.072 56 56 56 56-25.072 56-56S94.928 8 64 8zm0 36a20 20 0 0 1 20 20 20 20 0 0 1-20 20 20 20 0 0 1-20-20 20 20 0 0 1 20-20z" fill="#deddda"/><path d="M64 44a20 20 0 0 0-20 20 20 20 0 0 0 20 20 20 20 0 0 0 20-20 20 20 0 0 0-20-20zm0 12a8 8 0 0 1 8 8 8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8z" fill="#c0bfbc" fill-opacity=".947"/><path d="M64 8v36a20 20 0 0 1 14.133 5.867l25.469-25.469C93.468 14.264 79.464 8 64 8zM49.867 78.132l-25.469 25.469C34.532 113.735 48.536 119.999 64 119.999v-36a20 20 0 0 1-14.133-5.867z" fill="#f6f5f4" opacity=".5"/><path d="M64 40a24 24 0 0 0-24 24 24 24 0 0 0 24 24 24 24 0 0 0 24-24 24 24 0 0 0-24-24zm0 4a20 20 0 0 1 20 20 20 20 0 0 1-20 20 20 20 0 0 1-20-20 20 20 0 0 1 20-20z" fill="#9a9996" fill-opacity=".947"/></g><path d="M117.05 78h-14c-3-1-2.96-1.368-3-3-.052-2.091 3-4 3-7 0-2.216-1.784-4-4-4h-4c-2.216 0-4 1.784-4 4 0 3 2.914 4.751 3 7 .062 1.615 0 2-2.898 3H75.05v16c-1 3-1.368 2.96-3 3-2.092.052-4-3-7-3-2.216 0-4 1.784-4 4v4c0 2.216 1.784 4 4 4 3 0 4.751-2.914 7-3 1.614-.062 2 0 3 2.898V120h42v-14.246c-.96-2.74-1.363-2.814-2.948-2.754-2.248.087-4 3-7 3a3.99 3.99 0 0 1-4-4v-4c0-2.215 1.784-4 4-4 3 0 4.909 3.052 7 3 1.601-.04 1.989-.018 2.948-2.851z" fill="#1a5fb4"/><path d="M117 76h-14c-3-1-2.96-1.368-3-3-.052-2.091 3-4 3-7 0-2.216-1.784-4-4-4h-4c-2.216 0-4 1.784-4 4 0 3 2.914 4.751 3 7 .062 1.615 0 2-2.898 3H75v16c-1 3-1.368 2.96-3 3-2.092.052-4-3-7-3-2.216 0-4 1.784-4 4v4c0 2.216 1.784 4 4 4 3 0 4.751-2.914 7-3 1.614-.062 2 0 3 2.898V118h42v-14.246c-.96-2.74-1.363-2.814-2.948-2.754-2.248.087-4 3-7 3a3.99 3.99 0 0 1-4-4v-4c0-2.215 1.784-4 4-4 3 0 4.909 3.052 7 3 1.601-.04 1.989-.018 2.948-2.851z" fill="#3584e4"/></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.1.8/src/icons/hicolor/scalable/apps/yast-product-registration.svg new/yast2-registration-4.1.11/src/icons/hicolor/scalable/apps/yast-product-registration.svg --- old/yast2-registration-4.1.8/src/icons/hicolor/scalable/apps/yast-product-registration.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-4.1.11/src/icons/hicolor/scalable/apps/yast-product-registration.svg 2018-12-14 14:25:06.000000000 +0100 @@ -0,0 +1 @@ +<svg height="128" width="128" xmlns="http://www.w3.org/2000/svg"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="24" x2="104" y1="20" y2="20"><stop offset="0" stop-color="#8ff0a4"/><stop offset="1" stop-color="#81dffe"/></linearGradient><path d="M20 8h88v108H20z" fill="#f6f5f4"/><path d="M20 116h88v4H20z" fill="#deddda"/><path d="M60 104h44v4H60z" fill="#5e5c64"/><path d="M24 16h80v8H24z" fill="url(#a)"/><path d="M24 32h80v4H24zm0 8h80v4H24zm0 8h52v4H24zm0 12h80v4H24zm0 8h80v4H24zm0 8h60v4H24z" fill="#deddda"/><path d="M60 92h4v12h-4zm4 0h36v4H64zm36 0h4v12h-4z" fill="#5e5c64"/><path d="M24 96h32v8H24z" fill="#deddda"/><path d="M99.828 28.172L60 68l8 8 39.82-39.82a10 10 0 0 0-7.992-8.008z" fill="#f6d32d"/><path d="M60 68l-8 16 16-8z" fill="#ffd097"/><path d="M105.07 30.93L64 72l4 4 39.82-39.82a10 10 0 0 0-2.75-5.25z" fill="#f5c211"/><path d="M64 72L52 84l16-8z" fill="#ffb56c"/><path d="M56 76l4 4-8 4z" fill="#3d3846"/><path d="M58 78l-6 6 8-4z"/><path d="M24 12h8v4h-8zm12 0h8v4h-8z" fill="#9a9996"/></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.1.8/src/lib/registration/clients/inst_scc.rb new/yast2-registration-4.1.11/src/lib/registration/clients/inst_scc.rb --- old/yast2-registration-4.1.8/src/lib/registration/clients/inst_scc.rb 2018-11-21 17:44:29.000000000 +0100 +++ new/yast2-registration-4.1.11/src/lib/registration/clients/inst_scc.rb 2018-12-14 14:25:06.000000000 +0100 @@ -188,7 +188,7 @@ return Mode.normal ? :abort : :auto end - if Mode.update + if Stage.initial Wizard.SetContents( _("Registration"), Empty(), @@ -197,7 +197,9 @@ false, false ) + end + if Mode.update ::Registration::SwMgmt.copy_old_credentials(Installation.destdir) if File.exist?(SUSE::Connect::YaST::GLOBAL_CREDENTIALS_FILE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.1.8/src/lib/registration/sw_mgmt.rb new/yast2-registration-4.1.11/src/lib/registration/sw_mgmt.rb --- old/yast2-registration-4.1.8/src/lib/registration/sw_mgmt.rb 2018-11-21 17:44:29.000000000 +0100 +++ new/yast2-registration-4.1.11/src/lib/registration/sw_mgmt.rb 2018-12-14 14:25:06.000000000 +0100 @@ -25,7 +25,6 @@ require "tmpdir" require "fileutils" -require "shellwords" require "ostruct" require "registration/exceptions" @@ -35,6 +34,7 @@ require "packager/product_patterns" require "y2packager/product_reader" +require "yast2/execute" module Registration Yast.import "AddOnProduct" @@ -481,14 +481,28 @@ # SMT uses extra ACL permissions, make sure they are kept in the copied file, # (use "cp -a ", ::FileUtils.cp(..., preserve: true) cannot be used as it preserves only # the traditional Unix file permissions, the extended ACLs are NOT copied!) - `cp -a #{Shellwords.escape(file)} #{Shellwords.escape(new_file)}` + Yast::Execute.locally!("cp", "-a", file, new_file) - credentials = SUSE::Connect::YaST.credentials(new_file) + use_credentials(new_file) + rescue Cheetah::ExecutionFailed => error + log.warn "Cannot copy the old credentials file #{file} to #{new_file}: #{error.message}" + end + + # Use credentials from a file + # + # @param filename [String] credentials filename. + # @return [Boolean] true if credentials can be used; false otherwise. + def self.use_credentials(filename) + credentials = SUSE::Connect::YaST.credentials(filename) log.info "Using previous credentials (username): #{credentials.username}" + true rescue SUSE::Connect::MalformedSccCredentialsFile => e log.warn "Cannot parse the credentials file: #{e.inspect}" + false end + private_class_method :use_credentials + def self.find_addon_updates(addons) log.info "Available addons: #{addons.map(&:identifier)}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.1.8/src/lib/registration/ui/base_system_registration_dialog.rb new/yast2-registration-4.1.11/src/lib/registration/ui/base_system_registration_dialog.rb --- old/yast2-registration-4.1.8/src/lib/registration/ui/base_system_registration_dialog.rb 2018-11-21 17:44:29.000000000 +0100 +++ new/yast2-registration-4.1.11/src/lib/registration/ui/base_system_registration_dialog.rb 2018-12-14 14:25:06.000000000 +0100 @@ -74,6 +74,8 @@ set_focus event_loop + ensure + Yast::Wizard.ClearContents end # Set the initial action diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.1.8/test/sw_mgmt_spec.rb new/yast2-registration-4.1.11/test/sw_mgmt_spec.rb --- old/yast2-registration-4.1.8/test/sw_mgmt_spec.rb 2018-11-21 17:44:29.000000000 +0100 +++ new/yast2-registration-4.1.11/test/sw_mgmt_spec.rb 2018-12-14 14:25:06.000000000 +0100 @@ -224,67 +224,85 @@ let(:scc_credentials) { File.join(root_dir, target_dir, "SCCcredentials") } before do - expect(File).to receive(:exist?).with(target_dir).and_return(false) + allow(File).to receive(:exist?).with(target_dir).and_return(false) allow(File).to receive(:file?).and_return(true) - expect(FileUtils).to receive(:mkdir_p).with(target_dir) + allow(FileUtils).to receive(:mkdir_p).with(target_dir) end it "does not fail when the old credentials are missing" do - expect(Dir).to receive(:[]).with(File.join(root_dir, target_dir, "*")) + allow(Dir).to receive(:[]).with(File.join(root_dir, target_dir, "*")) .and_return([]) # no copy - expect(FileUtils).to receive(:cp).never + expect(Yast::Execute).to_not receive(:locally!).with("cp", any_args) + + expect { subject.copy_old_credentials(root_dir) }.to_not raise_error + end + + it "does not fail when the old credentials file cannot be copied" do + allow(Dir).to receive(:[]).with(File.join(root_dir, target_dir, "*")) + .and_return([ncc_credentials]) + + error = Cheetah::ExecutionFailed.new([], "", nil, nil) + + allow(Yast::Execute).to receive(:locally!).with("cp", any_args) + .and_raise(error) expect { subject.copy_old_credentials(root_dir) }.to_not raise_error end it "copies old NCC credentials at upgrade" do - expect(Dir).to receive(:[]).with(File.join(root_dir, target_dir, "*")) + allow(Dir).to receive(:[]).with(File.join(root_dir, target_dir, "*")) .and_return([ncc_credentials]) - expect(subject).to receive(:`).with("cp -a " + ncc_credentials + " " + - File.join(target_dir, "SCCcredentials")) - expect(SUSE::Connect::YaST).to receive(:credentials).and_return(OpenStruct.new) + allow(SUSE::Connect::YaST).to receive(:credentials).and_return(OpenStruct.new) + + expect(Yast::Execute).to receive(:locally!) + .with("cp", "-a", ncc_credentials, File.join(target_dir, "SCCcredentials")) subject.copy_old_credentials(root_dir) end it "prefers the SCC credentials if both NCC and SCC credentials are present" do # deliberately return the SCC credentials first here - expect(Dir).to receive(:[]).with(File.join(root_dir, target_dir, "*")) + allow(Dir).to receive(:[]).with(File.join(root_dir, target_dir, "*")) .and_return([scc_credentials, ncc_credentials]) - # copy the credentials in the NCC, SCC order (bsc#1096813) - expect(subject).to receive(:`).with("cp -a " + ncc_credentials + " " + - File.join(target_dir, "SCCcredentials")).ordered - expect(subject).to receive(:`).with("cp -a " + scc_credentials + " " + - File.join(target_dir, "SCCcredentials")).ordered - allow(SUSE::Connect::YaST).to receive(:credentials).and_return(OpenStruct.new) + # copy the credentials in the NCC, SCC order (bsc#1096813) + expect(Yast::Execute).to receive(:locally!) + .with("cp", "-a", ncc_credentials, File.join(target_dir, "SCCcredentials")) + .ordered + + expect(Yast::Execute).to receive(:locally!) + .with("cp", "-a", scc_credentials, File.join(target_dir, "SCCcredentials")) + .ordered + subject.copy_old_credentials(root_dir) end it "copies old SCC credentials at upgrade" do - expect(Dir).to receive(:[]).with(File.join(root_dir, target_dir, "*")) + allow(Dir).to receive(:[]).with(File.join(root_dir, target_dir, "*")) .and_return([scc_credentials]) - expect(subject).to receive(:`).with("cp -a " + scc_credentials + " " + - File.join(target_dir, "SCCcredentials")) - expect(SUSE::Connect::YaST).to receive(:credentials).and_return(OpenStruct.new) + allow(SUSE::Connect::YaST).to receive(:credentials).and_return(OpenStruct.new) + + expect(Yast::Execute).to receive(:locally!) + .with("cp", "-a", scc_credentials, File.join(target_dir, "SCCcredentials")) subject.copy_old_credentials(root_dir) end it "copies old SMT credentials at upgrade" do smt_credentials = File.join(root_dir, target_dir, "SMT-http_smt_example_com") - expect(Dir).to receive(:[]).with(File.join(root_dir, target_dir, "*")) + allow(Dir).to receive(:[]).with(File.join(root_dir, target_dir, "*")) .and_return([smt_credentials]) - expect(subject).to receive(:`).with("cp -a " + smt_credentials + " " + - File.join(target_dir, "SMT-http_smt_example_com")) - expect(SUSE::Connect::YaST).to receive(:credentials).and_return(OpenStruct.new) + allow(SUSE::Connect::YaST).to receive(:credentials).and_return(OpenStruct.new) + + expect(Yast::Execute).to receive(:locally!) + .with("cp", "-a", smt_credentials, File.join(target_dir, "SMT-http_smt_example_com")) subject.copy_old_credentials(root_dir) end

1 0

commit branding-openSUSE for openSUSE:Factory
by root 31 Dec '18

31 Dec '18

Hello community, here is the log from the commit of package branding-openSUSE for openSUSE:Factory checked in at 2018-12-31 09:43:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.branding-openSUSE.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "branding-openSUSE" Mon Dec 31 09:43:55 2018 rev:102 rq:658043 version:15.0 Changes: -------- --- /work/SRC/openSUSE:Factory/branding-openSUSE/branding-openSUSE.changes 2018-05-06 14:56:03.664932018 +0200 +++ /work/SRC/openSUSE:Factory/.branding-openSUSE.new.28833/branding-openSUSE.changes 2018-12-31 09:43:57.002336474 +0100 @@ -1,0 +2,13 @@ +Fri Dec 14 07:07:50 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org> + +- Slim down plymouth branding by 100kb +- Change fonts in installer to fit the branding + +------------------------------------------------------------------- +Thu Nov 15 02:17:21 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org> + +- Added systemd icons package before systemd 240 +- Fixed issues with YaST showing wrong size of icons for partitioner +- Migrated YaST theme to using SVG images instead of PNG + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.xnikK3/_old 2018-12-31 09:43:58.102335572 +0100 +++ /var/tmp/diff_new_pack.xnikK3/_new 2018-12-31 09:43:58.102335572 +0100 @@ -83,6 +83,8 @@ Summary: openSUSE branding for yast2-qt License: BSD-3-Clause Group: System/Fhs +Requires: adobe-sourcesanspro-fonts +Requires: google-opensans-fonts Conflicts: yast2-qt-branding Provides: yast2-qt-branding = %{version} BuildArch: noarch @@ -111,6 +113,16 @@ %description -n xfce4-splash-branding-openSUSE openSUSE %{version} branding for the XFCE splash +%package -n systemd-icon-branding-openSUSE +Summary: Icons used with systemd +License: CC-BY-SA-3.0 +Group: System/Fhs +Conflicts: systemd-icon-branding + +%description -n systemd-icon-branding-openSUSE +Those icons are designed to represent openSUSE with systemd osrelease +LOGO variable + %if 0%{?package_grub2_theme} > 0 %package -n grub2-branding-openSUSE Summary: openSUSE branding for GRUB2's graphical console @@ -319,6 +331,9 @@ %{_datadir}/pixmaps/xfce4-splash-openSUSE.png +%files -n systemd-icon-branding-openSUSE +/usr/share/icons/hicolor + %if 0%{?package_grub2_theme} > 0 %files -n grub2-branding-openSUSE %{_datadir}/grub2 ++++++ openSUSE.tar.xz ++++++ /work/SRC/openSUSE:Factory/branding-openSUSE/openSUSE.tar.xz /work/SRC/openSUSE:Factory/.branding-openSUSE.new.28833/openSUSE.tar.xz differ: char 26, line 1

1 0

commit yast2-services-manager for openSUSE:Factory
by root 31 Dec '18

31 Dec '18

Hello community, here is the log from the commit of package yast2-services-manager for openSUSE:Factory checked in at 2018-12-31 09:43:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-services-manager (Old) and /work/SRC/openSUSE:Factory/.yast2-services-manager.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-services-manager" Mon Dec 31 09:43:51 2018 rev:44 rq:657950 version:4.1.11 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-services-manager/yast2-services-manager.changes 2018-11-01 18:56:46.741975842 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-services-manager.new.28833/yast2-services-manager.changes 2018-12-31 09:43:52.870339857 +0100 @@ -1,0 +2,18 @@ +Wed Dec 12 15:55:24 UTC 2018 - schubi(a)suse.de + +- Fix: Do not crash in chroot environment (bsc#1113732) +- 4.1.11 + +------------------------------------------------------------------- +Wed Dec 12 15:46:31 UTC 2018 - Josef Reidinger <jreidinger(a)suse.com> + +- always use absolute path to binaries (bsc#1118291) +- 4.1.10 + +------------------------------------------------------------------- +Mon Nov 26 02:52:52 UTC 2018 - Noah Davis <noahadvs(a)gmail.com> + +- Provide icon with module (boo#1109310) +- 4.1.9 + +------------------------------------------------------------------- Old: ---- yast2-services-manager-4.1.8.tar.bz2 New: ---- yast2-services-manager-4.1.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-services-manager.spec ++++++ --- /var/tmp/diff_new_pack.abKyHq/_old 2018-12-31 09:43:53.262339537 +0100 +++ /var/tmp/diff_new_pack.abKyHq/_new 2018-12-31 09:43:53.262339537 +0100 @@ -24,7 +24,7 @@ ###################################################################### Name: yast2-services-manager -Version: 4.1.8 +Version: 4.1.11 Release: 0 BuildArch: noarch @@ -79,6 +79,7 @@ %suse_update_desktop_file services-manager %define yast_dir %{_prefix}/share/YaST2 +%define yast_icondir %{_datadir}/icons %files %defattr(-,root,root) @@ -96,7 +97,7 @@ %dir %{yast_dir}/lib/services-manager/dialogs %{yast_dir}/lib/services-manager/dialogs/*.rb %{_prefix}/share/applications/YaST2/services-manager.desktop - +%{yast_icondir} %_docdir/%name/ %license COPYING ++++++ yast2-services-manager-4.1.8.tar.bz2 -> yast2-services-manager-4.1.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-4.1.8/package/yast2-services-manager.changes new/yast2-services-manager-4.1.11/package/yast2-services-manager.changes --- old/yast2-services-manager-4.1.8/package/yast2-services-manager.changes 2018-10-16 17:43:02.000000000 +0200 +++ new/yast2-services-manager-4.1.11/package/yast2-services-manager.changes 2018-12-13 11:58:38.000000000 +0100 @@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Wed Dec 12 15:55:24 UTC 2018 - schubi(a)suse.de + +- Fix: Do not crash in chroot environment (bsc#1113732) +- 4.1.11 + +------------------------------------------------------------------- +Wed Dec 12 15:46:31 UTC 2018 - Josef Reidinger <jreidinger(a)suse.com> + +- always use absolute path to binaries (bsc#1118291) +- 4.1.10 + +------------------------------------------------------------------- +Mon Nov 26 02:52:52 UTC 2018 - Noah Davis <noahadvs(a)gmail.com> + +- Provide icon with module (boo#1109310) +- 4.1.9 + +------------------------------------------------------------------- Tue Oct 16 15:28:34 CEST 2018 - schubi(a)suse.de - Added license file to spec. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-4.1.8/package/yast2-services-manager.spec new/yast2-services-manager-4.1.11/package/yast2-services-manager.spec --- old/yast2-services-manager-4.1.8/package/yast2-services-manager.spec 2018-10-16 17:43:02.000000000 +0200 +++ new/yast2-services-manager-4.1.11/package/yast2-services-manager.spec 2018-12-13 11:58:38.000000000 +0100 @@ -24,7 +24,7 @@ ###################################################################### Name: yast2-services-manager -Version: 4.1.8 +Version: 4.1.11 Release: 0 BuildArch: noarch @@ -79,6 +79,7 @@ %suse_update_desktop_file services-manager %define yast_dir %{_prefix}/share/YaST2 +%define yast_icondir %{_datadir}/icons %files %defattr(-,root,root) @@ -96,6 +97,6 @@ %dir %{yast_dir}/lib/services-manager/dialogs %{yast_dir}/lib/services-manager/dialogs/*.rb %{_prefix}/share/applications/YaST2/services-manager.desktop - +%{yast_icondir} %_docdir/%name/ %license COPYING diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-4.1.8/src/desktop/services-manager.desktop new/yast2-services-manager-4.1.11/src/desktop/services-manager.desktop --- old/yast2-services-manager-4.1.8/src/desktop/services-manager.desktop 2018-10-16 17:43:02.000000000 +0200 +++ new/yast2-services-manager-4.1.11/src/desktop/services-manager.desktop 2018-12-13 11:58:38.000000000 +0100 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstResourceAliases=runlevel X-SuSE-YaST-Keywords=systemd,system,background -Icon=yast-runlevel +Icon=yast-services-manager Exec=xdg-su -c "/sbin/yast2 services-manager" Name=Services Manager diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-4.1.8/src/icons/hicolor/scalable/apps/yast-services-manager.svg new/yast2-services-manager-4.1.11/src/icons/hicolor/scalable/apps/yast-services-manager.svg --- old/yast2-services-manager-4.1.8/src/icons/hicolor/scalable/apps/yast-services-manager.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-services-manager-4.1.11/src/icons/hicolor/scalable/apps/yast-services-manager.svg 2018-12-13 11:58:38.000000000 +0100 @@ -0,0 +1 @@ +<svg height="128" width="128" xmlns="http://www.w3.org/2000/svg"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="36" x2="120" y1="92" y2="8"><stop offset="0" stop-color="#deddda"/><stop offset="1" stop-color="#f6f5f4"/></linearGradient><g stroke-width="4"><path d="M120 12s-48.932 6.888-72 24C34.288 46.172 16 76 16 76l40 40s27.884-17.068 40-32c18.096-22.304 24-72 24-72z" fill="#c0bfbc"/><path d="M120 8s-48.932 6.888-72 24C34.288 42.172 16 72 16 72l40 40s27.884-17.068 40-32c18.096-22.304 24-72 24-72z" fill="url(#a)"/><path d="M80 32a16 16 0 0 0-16 16 16 16 0 0 0 16 16 16 16 0 0 0 16-16 16 16 0 0 0-16-16z" fill="#9a9996"/><path d="M80 36a12 12 0 0 0-12 12 12 12 0 0 0 12 12 12 12 0 0 0 12-12 12 12 0 0 0-12-12z" fill="#241f31"/><path d="M40 44L8 92V68l32-28zM88 92v-4l-48 32v4h24zM24 92l36-24v4l-20 36-24 8v-4z" fill="#a51d2d"/><g fill="#e01b24"><path d="M40 40L8 88V64zM88 88l-48 32h24zM24 88l36-20-20 36-24 8zM120 8s-11.84 1.676-26.6 5.4l21.544 21.544A255.88 255.88 0 0 0 120 8z"/></g><path d="M80 36a12 12 0 0 0-12 12 12 12 0 0 0 10.44 11.88l6.796-22.668A12 12 0 0 0 80 36z" fill="#fff" opacity=".2"/></g></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-4.1.8/src/lib/services-manager/clients/default_target_proposal.rb new/yast2-services-manager-4.1.11/src/lib/services-manager/clients/default_target_proposal.rb --- old/yast2-services-manager-4.1.8/src/lib/services-manager/clients/default_target_proposal.rb 2018-10-16 17:43:02.000000000 +0200 +++ new/yast2-services-manager-4.1.11/src/lib/services-manager/clients/default_target_proposal.rb 2018-12-13 11:58:38.000000000 +0100 @@ -114,7 +114,7 @@ def create_dialog caption = _("Set Default Systemd Target") Wizard.CreateDialog - Wizard.SetTitleIcon "yast-runlevel" + Wizard.SetDesktopIcon "services-manager" Wizard.SetContentsButtons( caption, generate_content, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-4.1.8/src/lib/services-manager/dialogs/services_manager.rb new/yast2-services-manager-4.1.11/src/lib/services-manager/dialogs/services_manager.rb --- old/yast2-services-manager-4.1.8/src/lib/services-manager/dialogs/services_manager.rb 2018-10-16 17:43:02.000000000 +0200 +++ new/yast2-services-manager-4.1.11/src/lib/services-manager/dialogs/services_manager.rb 2018-12-13 11:58:38.000000000 +0100 @@ -29,6 +29,7 @@ require "services-manager/widgets/show_details_button" require "services-manager/widgets/logs_button" require "services-manager/widgets/services_table" +require "services-manager/service_loader" Yast.import "ServicesManager" Yast.import "UI" @@ -586,6 +587,10 @@ # # @return [Array<String>] name of all services def read_services + if Y2ServicesManager::ServiceLoader.chroot_env? + Popup.Error(_("Cannot read services in chroot environment.")) + return [] + end Yast2::Feedback.show(_("Reading services status...")) do ServicesManagerService.reload ServicesManagerService.all.keys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-4.1.8/src/lib/services-manager/service_loader.rb new/yast2-services-manager-4.1.11/src/lib/services-manager/service_loader.rb --- old/yast2-services-manager-4.1.8/src/lib/services-manager/service_loader.rb 2018-10-16 17:43:02.000000000 +0200 +++ new/yast2-services-manager-4.1.11/src/lib/services-manager/service_loader.rb 2018-12-13 11:58:38.000000000 +0100 @@ -42,9 +42,9 @@ class ServiceLoader include Yast::Logger - LIST_UNIT_FILES_COMMAND = 'systemctl list-unit-files --type service' - LIST_UNITS_COMMAND = 'systemctl list-units --all --type service' - STATUS_COMMAND = 'systemctl status' + LIST_UNIT_FILES_COMMAND = '/usr/bin/systemctl list-unit-files --type service' + LIST_UNITS_COMMAND = '/usr/bin/systemctl list-units --all --type service' + STATUS_COMMAND = '/usr/bin/systemctl status' # FIXME: duplicated in Yast::Systemctl COMMAND_OPTIONS = ' --no-legend --no-pager --no-ask-password ' TERM_OPTIONS = ' LANG=C TERM=dumb COLUMNS=1024 ' @@ -91,6 +91,8 @@ @unit_files = {} @units = {} + return {} if self.class.chroot_env? # systemd is not available + load_unit_files load_units @@ -106,6 +108,15 @@ services end + # Checking if the module is running in chroot environment + # + # @return [Boolean] if running in chroot environment + def self.chroot_env? + command = TERM_OPTIONS + STATUS_COMMAND + COMMAND_OPTIONS + ret = Yast::SCR.Execute(Yast::Path.new('.target.bash_output'), command)['stderr'] + ret.start_with?("Running in chroot") + end + private # FIXME: use Yast::Systemctl for this, remember to chomp SERVICE_SUFFIX @@ -171,13 +182,12 @@ extract_services_from_unit_files # Add old LSB services (Services which are loaded but not available as a unit file) extract_services_from_units - service_names = services.keys.sort ss = Yast2::SystemService.find_many(service_names) # Rest of settings services.clear ss.each do |s| - services[s.name] = s + services[s.name] = s if s.service # name is a def_delegator of SystemService.service.name end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-4.1.8/src/lib/services-manager/widgets/start_mode_button.rb new/yast2-services-manager-4.1.11/src/lib/services-manager/widgets/start_mode_button.rb --- old/yast2-services-manager-4.1.8/src/lib/services-manager/widgets/start_mode_button.rb 2018-10-16 17:43:02.000000000 +0200 +++ new/yast2-services-manager-4.1.11/src/lib/services-manager/widgets/start_mode_button.rb 2018-12-13 11:58:38.000000000 +0100 @@ -91,6 +91,7 @@ # @return [Array<Yast::Term>] def items start_modes = ServicesManagerService.start_modes(service_name) + return [] unless start_modes #start_modes can also return false due errors ServicesManagerService.all_start_modes.each_with_object([]) do |mode, all| next unless start_modes.include?(mode) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-4.1.8/test/service_loader_test.rb new/yast2-services-manager-4.1.11/test/service_loader_test.rb --- old/yast2-services-manager-4.1.8/test/service_loader_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-services-manager-4.1.11/test/service_loader_test.rb 2018-12-13 11:58:38.000000000 +0100 @@ -0,0 +1,109 @@ +#!/usr/bin/env rspec +# encoding: utf-8 + +# Copyright (c) [2018] 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. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative 'test_helper' + + +require "yast" +require "services-manager/service_loader" + +describe Y2ServicesManager::ServiceLoader do + + subject { described_class.new } + + let(:alsasound) do + instance_double( + Yast2::SystemService, name: "alsasound", description: "alsasound", start: true, stop: true, + state: "active", substate: "running", changed?: false, start_mode: :on_boot, + save: nil, refresh: nil, errors: {}, service: Yast2::SystemService.build("alsasound") + ) + end + + let(:apparmor) do + instance_double( + Yast2::SystemService, name: "apparmor", changed?: true, active?: true, + running?: false, refresh: nil, save: nil, errors: {}, service: Yast2::SystemService.build("apparmor") + ) + end + + let(:empty_SystemService) do + instance_double( + Yast2::SystemService, errors: {}, service: nil + ) + end + + let(:services) do + [alsasound, apparmor] + end + + describe "#read" do + before do + allow_any_instance_of(Y2ServicesManager::ServiceLoader) + .to receive(:list_unit_files). + and_return(["apparmor.service enabled\n", + "alsasound.service static\n"]) + allow_any_instance_of(Y2ServicesManager::ServiceLoader) + .to receive(:list_units). + and_return(["alsasound.service loaded inactive dead Sound Card\n", + "apparmor.service loaded active exited AppArmor profiles\n"]) + allow(Y2ServicesManager::ServiceLoader) + .to receive(:chroot_env?).and_return(false) + end + + context "when services can be evalutated by systemd/sockets" do + it "returns services with correct name" do + expect(Yast2::SystemService).to receive(:find_many). + with(services.map {|service| service.name}.sort). + and_return(services) + read_services = subject.read.map {|key, service| service.name} + expect(read_services).to eq( services.map {|service| service.name}) + end + end + + context "when services cannot be evalutated by systemd/sockets" do + it "returns none services" do + expect(Yast2::SystemService).to receive(:find_many). + with(services.map {|service| service.name}.sort). + and_return([empty_SystemService,empty_SystemService]) + expect(subject.read).to be_empty + end + end + end + + describe ".chroot_env?" do + context "when it has been started in chroot environment" do + it "returns true" do + expect(Yast::SCR).to receive(:Execute).with(Yast::Path.new(".target.bash_output"), + /systemctl status/).and_return({"stderr" => "Running in chroot"}) + expect(Y2ServicesManager::ServiceLoader.chroot_env?).to be true + end + end + + context "when it has not been started in chroot environment" do + it "returns true" do + expect(Yast::SCR).to receive(:Execute).with(Yast::Path.new(".target.bash_output"), + /systemctl status/).and_return({"stderr" => ""}) + expect(Y2ServicesManager::ServiceLoader.chroot_env?).to be false + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-4.1.8/test/support/services_manager_helpers.rb new/yast2-services-manager-4.1.11/test/support/services_manager_helpers.rb --- old/yast2-services-manager-4.1.8/test/support/services_manager_helpers.rb 2018-10-16 17:43:02.000000000 +0200 +++ new/yast2-services-manager-4.1.11/test/support/services_manager_helpers.rb 2018-12-13 11:58:38.000000000 +0100 @@ -84,9 +84,9 @@ end start_modes = service_specs[:start_modes] || [:on_boot, :manually] - + service_name = service_specs[:unit].split(".").first service = instance_double(Yast2::SystemService, - name: service_specs[:unit].split(".").first, + name: service_name, start_mode: start_mode, start_modes: start_modes, active?: service_specs[:active] == "active", @@ -96,7 +96,8 @@ keywords: service_specs[:keywords], changed?: service_specs[:changed] || false, found?: service_specs[:found] || true, - errors: service_specs[:errors] || [] + errors: service_specs[:errors] || [], + service: Yast2::SystemService.build(service_name) ) allow(service).to receive(:start_mode=)

1 0