May 2014 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-installation for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2014-05-06 13:40:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2014-04-05 14:43:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2014-05-06 13:40:37.000000000 +0200 @@ -1,0 +2,94 @@ +Wed Apr 30 11:01:12 UTC 2014 - jreidinger(a)suse.com + +- use correct keywords for cio ignore kernel params (bnc#874902) +- move cio_ignore step after bootloader step to have sections + generated (bnc#873996) +- 3.1.76 + +------------------------------------------------------------------- +Fri Apr 25 13:21:52 UTC 2014 - mfilka(a)suse.com + +- bnc#872086 + - always copy network configuration. Even if network is not + running during installation +- 3.1.75 + +------------------------------------------------------------------- +Fri Apr 25 08:22:06 UTC 2014 - jsrain(a)suse.cz + +- enhanced handling of release notes from media (contrary to those + downloaded on-line) (bnc#874996) +- 3.1.74 + +------------------------------------------------------------------- +Thu Apr 24 16:02:13 CEST 2014 - locilka(a)suse.com + +- Changed inst_system_analysis to read Product information + (that uses libzypp) after initializing libzypp (bnc#873877) +- 3.1.73 + +------------------------------------------------------------------- +Wed Apr 23 08:48:13 UTC 2014 - jsrain(a)suse.cz + +- enable top bar with logo during installation (bnc#868722) +- 3.1.72 + +------------------------------------------------------------------- +Tue Apr 15 16:51:58 CEST 2014 - locilka(a)suse.com + +- Switched from the old to the new network setup client for remote + repositories (bnc#869640) +- 3.1.71 + +------------------------------------------------------------------- +Tue Apr 15 07:02:35 UTC 2014 - jreidinger(a)suse.com + +- fix crash from last fix and adapt it to cooperate nice with + autoinstallation (bnc#873458) +- 3.1.70 + +------------------------------------------------------------------- +Mon Apr 14 14:38:22 UTC 2014 - jreidinger(a)suse.com + +- return error message if base product not found and continue in + installation(bnc#873458) +- 3.1.69 + +------------------------------------------------------------------- +Mon Apr 14 10:11:52 CEST 2014 - locilka(a)suse.com + +- removed loading 'pciehp' Kernel module (added for SLE 11 by FATE + #311991) - it is now built-in Kernel (bnc#865834) +- 3.1.68 + +------------------------------------------------------------------- +Fri Apr 11 08:44:10 UTC 2014 - jsrain(a)suse.cz + +- added missing files to package (bnc#872925) +- 3.1.67 + +------------------------------------------------------------------- +Thu Apr 10 09:34:30 UTC 2014 - mvidner(a)suse.com + +- Put wizard title on the left instead of on top (bnc#868859) +- 3.1.66 + +------------------------------------------------------------------- +Thu Apr 10 09:15:56 UTC 2014 - jsrain(a)suse.cz + +- added handling of release notes for slide show (bnc#871158) +- 3.1.65 + +------------------------------------------------------------------- +Wed Apr 9 10:07:02 CEST 2014 - snwint(a)suse.de + +- save a copy of pbl.log +- 3.1.64 + +------------------------------------------------------------------- +Fri Apr 4 15:33:40 CEST 2014 - snwint(a)suse.de + +- remove LIBGL_ALWAYS_INDIRECT (bnc #869172) +- 3.1.63 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.1.62.tar.bz2 New: ---- yast2-installation-3.1.76.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.U4l4Xw/_old 2014-05-06 13:40:38.000000000 +0200 +++ /var/tmp/diff_new_pack.U4l4Xw/_new 2014-05-06 13:40:38.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.62 +Version: 3.1.76 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,13 +41,13 @@ BuildRequires: yast2-devtools >= 3.1.10 # Linuxrc.keys -BuildRequires: yast2 >= 3.1.9 +BuildRequires: yast2 >= 3.1.41 # clone_system client Requires: autoyast2-installation >= 3.1.5 -# ProductProfile -Requires: yast2 >= 3.1.9 +# Wizard.OpenLeftTitleNextBackDialog +Requires: yast2 >= 3.1.43 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) @@ -92,8 +92,8 @@ # Added new function WFM::ClientExists Conflicts: yast2-core < 2.17.10 -# ButtonBox widget -Conflicts: yast2-ycp-ui-bindings < 2.17.3 +# Top bar with logo +Conflicts: yast2-ycp-ui-bindings < 3.1.7 # tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) Requires: coreutils ++++++ yast2-installation-3.1.62.tar.bz2 -> yast2-installation-3.1.76.tar.bz2 ++++++ ++++ 2463 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-packager for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2014-05-06 13:40:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2014-04-13 13:13:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2014-05-06 13:40:35.000000000 +0200 @@ -1,0 +2,22 @@ +Mon Apr 28 13:55:39 CEST 2014 - locilka(a)suse.com + +- Logging status of all changed resolvables to be able to debug + and reproduce reported issues better (bnc#875350) +- 3.1.12 + +------------------------------------------------------------------- +Wed Apr 23 10:41:25 CEST 2014 - locilka(a)suse.com + +- Fixed function call that identified ComputeSystemPatternList + function as a constant (bnc#874725) +- 3.1.11 + +------------------------------------------------------------------- +Fri Apr 18 13:29:58 CEST 2014 - locilka(a)suse.com + +- Removed obsolete Product.patterns functionality and replaced + by new definition in control file software->default_patterns; + with little refactoring (bnc#873923) +- 3.1.10 + +------------------------------------------------------------------- Old: ---- yast2-packager-3.1.9.tar.bz2 New: ---- yast2-packager-3.1.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.Z27zZM/_old 2014-05-06 13:40:36.000000000 +0200 +++ /var/tmp/diff_new_pack.Z27zZM/_new 2014-05-06 13:40:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.9 +Version: 3.1.12 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-packager-3.1.9.tar.bz2 -> yast2-packager-3.1.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.9/package/yast2-packager.changes new/yast2-packager-3.1.12/package/yast2-packager.changes --- old/yast2-packager-3.1.9/package/yast2-packager.changes 2014-04-11 16:29:40.000000000 +0200 +++ new/yast2-packager-3.1.12/package/yast2-packager.changes 2014-04-28 16:09:49.000000000 +0200 @@ -1,4 +1,26 @@ ------------------------------------------------------------------- +Mon Apr 28 13:55:39 CEST 2014 - locilka(a)suse.com + +- Logging status of all changed resolvables to be able to debug + and reproduce reported issues better (bnc#875350) +- 3.1.12 + +------------------------------------------------------------------- +Wed Apr 23 10:41:25 CEST 2014 - locilka(a)suse.com + +- Fixed function call that identified ComputeSystemPatternList + function as a constant (bnc#874725) +- 3.1.11 + +------------------------------------------------------------------- +Fri Apr 18 13:29:58 CEST 2014 - locilka(a)suse.com + +- Removed obsolete Product.patterns functionality and replaced + by new definition in control file software->default_patterns; + with little refactoring (bnc#873923) +- 3.1.10 + +------------------------------------------------------------------- Fri Apr 11 16:07:19 CEST 2014 - locilka(a)suse.cz - Test for Packages rewritten in RSpec to fix the build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.9/package/yast2-packager.spec new/yast2-packager-3.1.12/package/yast2-packager.spec --- old/yast2-packager-3.1.9/package/yast2-packager.spec 2014-04-11 16:29:40.000000000 +0200 +++ new/yast2-packager-3.1.12/package/yast2-packager.spec 2014-04-28 16:09:49.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.9 +Version: 3.1.12 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.9/src/clients/inst_rpmcopy.rb new/yast2-packager-3.1.12/src/clients/inst_rpmcopy.rb --- old/yast2-packager-3.1.9/src/clients/inst_rpmcopy.rb 2014-04-11 16:29:40.000000000 +0200 +++ new/yast2-packager-3.1.12/src/clients/inst_rpmcopy.rb 2014-04-28 16:09:49.000000000 +0200 @@ -153,6 +153,9 @@ # move the progress to the packages stage SlideShow.MoveToStage("packages") + # bnc#875350: Log the current user/app_high software selection + Packages.log_software_selection + # install packages from CD current_cd_no to CD maxnumbercds @result = InstallPackagesFromMedia(@current_cd_no, @maxnumbercds) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.9/src/modules/Packages.rb new/yast2-packager-3.1.12/src/modules/Packages.rb --- old/yast2-packager-3.1.9/src/modules/Packages.rb 2014-04-11 16:29:40.000000000 +0200 +++ new/yast2-packager-3.1.12/src/modules/Packages.rb 2014-04-28 16:09:49.000000000 +0200 @@ -9,6 +9,11 @@ module Yast class PackagesClass < Module + include Yast::Logger + + # All known types of resolvables + RESOLVABLE_TYPES = [:product, :patch, :package, :pattern, :language] + def main Yast.import "UI" Yast.import "Pkg" @@ -1980,43 +1985,39 @@ ret end - # Select system patterns - # @param [Boolean] reselect boolean true to select only those which are alrady selected + # Selects system-specific and default patterns for installation + # + # @param [Boolean] reselect whether to re-select all already selected patterns def SelectSystemPatterns(reselect) - system_patterns = ComputeSystemPatternList() + patterns = patterns_to_install + log.info "Selecting system patterns #{patterns}" - # autoinstallation has patterns specified in the profile - if !Mode.autoinst - system_patterns = Convert.convert( - Builtins.toset(Builtins.merge(system_patterns, Product.patterns)), - :from => "list", - :to => "list <string>" - ) - end if !reselect - Builtins.y2milestone("Selecting system patterns %1", system_patterns) - Builtins.foreach(system_patterns) do |p| - prop = Ops.get(Pkg.ResolvableProperties(p, :pattern, ""), 0, {}) - if Ops.get(prop, "status") == :available && - Ops.get(prop, "transact_by") == :user - Builtins.y2milestone("Ignoring deselected pattern '%1'", p) + patterns.each do |pattern_name| + prop = Pkg.ResolvableProperties(pattern_name, :pattern, "").first + + if prop.nil? + # It comes from product definition which has to be in order + raise "Pattern #{pattern_name} does not exist" + elsif prop["status"] == :available && prop["transact_by"] == :user + log.info "Skipping pattern #{pattern_name} deselected by user" else - Pkg.ResolvableInstall(p, :pattern) + Pkg.ResolvableInstall(pattern_name, :pattern) end end else - Builtins.y2milestone("Re-selecting system patterns %1", system_patterns) - pats = Builtins.filter(system_patterns) do |p| - descrs = Pkg.ResolvableProperties(p, :pattern, "") - descrs = Builtins.filter(descrs) do |descr| - Ops.get(descr, "status") == :selected - end - Ops.greater_than(Builtins.size(descrs), 0) + patterns.select! do |pattern_name| + descrs = Pkg.ResolvableProperties(pattern_name, :pattern, "") + # It comes from product definition which has to be in order + raise "Pattern #{pattern_name} does not exist" if descrs.empty? + descrs.any?{ |descr| descr["status"] == :selected } end - Builtins.y2milestone("Selected patterns to be reselected: %1", pats) - Builtins.foreach(pats) do |p| - Pkg.ResolvableRemove(p, :pattern) - Pkg.ResolvableInstall(p, :pattern) + + log.info "Selected patterns to be reselected: #{patterns}" + + patterns.each do |pattern_name| + Pkg.ResolvableRemove(pattern_name, :pattern) + Pkg.ResolvableInstall(pattern_name, :pattern) end end @@ -2371,6 +2372,71 @@ nil end + # Reads software->default_patterns and returns lisf of patterns that should + # be selected for installation by default + # + # @return [Array] list of patterns + def default_patterns + patterns = ProductFeatures.GetStringFeature("software", "default_patterns") + log.info "Default patterns: #{patterns}" + patterns.split(/[, \n]/).reject(&:empty?) + end + + # Log only resolvables with resolvable["status"] matching these below + LOG_RESOLVABLE_STATUS = [:selected, :removed] + + # Log only resolvables with resolvable["transact_by"] matching these below + LOG_RESOLVABLE_TRANSACT_BY = [:user, :app_high] + + # Reads the current user selection and dumps it to log + def log_software_selection + log.info "-" * 10 << " Transaction Status Begin " << "-" * 10 + + RESOLVABLE_TYPES.each do |type| + resolvables = Pkg.ResolvableProperties("", type, "") + resolvables.select!{ |r| LOG_RESOLVABLE_TRANSACT_BY.include? r["transact_by"] } + + LOG_RESOLVABLE_TRANSACT_BY.each do |transact_by| + changed_resolvables = resolvables.select{ |r| r["transact_by"] == transact_by} + next if changed_resolvables.empty? + + decided_resolvables = changed_resolvables.select{ |r| LOG_RESOLVABLE_STATUS.include? r["status"] } + log_resolvables("Resolvables of type #{type} set by #{transact_by}:", decided_resolvables) + + locked_resolvables = changed_resolvables.select{ |r| r["locked"] } + log_resolvables("Locked resolvables of type #{type} set by #{transact_by}:", locked_resolvables) + end + end + + log.info "-" * 10 << " Transaction Status End " << "-" * 10 + nil + end + + private + + def log_resolvables(text, resolvables) + return if resolvables.empty? + + log.info text + + resolvables.each do |r| + r_info = {:name => r["name"], :version => r["version"], :arch => r["arch"], :status => r["status"]} + log.info "- #{r_info}" + end + end + + # Computes all patterns that are expected to be selected for default installation + def patterns_to_install + patterns = ComputeSystemPatternList() + + # autoinstallation has patterns specified in the profile + if !Mode.autoinst + default_patterns.inject(patterns, :<<) + end + + patterns + end + publish :variable => :install_sources, :type => "boolean" publish :variable => :timestamp, :type => "integer" publish :variable => :metadir, :type => "string" @@ -2410,6 +2476,8 @@ publish :function => :InitializeCatalogs, :type => "void ()" publish :function => :InitFailed, :type => "boolean ()" publish :function => :SelectKernelPackages, :type => "void ()" + publish :function => :default_patterns, :type => "list <string> ()" + publish :function => :log_software_selection, :type => "void ()" end Packages = PackagesClass.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.9/test/data/zypp/products.yml new/yast2-packager-3.1.12/test/data/zypp/products.yml --- old/yast2-packager-3.1.9/test/data/zypp/products.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-3.1.12/test/data/zypp/products.yml 2014-04-28 16:09:49.000000000 +0200 @@ -0,0 +1,109 @@ +--- +- arch: x86_64 + category: base + description: openSUSE is a distribution by the openSUSE.org project. + display_name: openSUSE (INSTALLED) + download_size: 0 + flags: [] + flavor: dvd-promo + inst_size: 0 + locked: false + medium_nr: 0 + name: openSUSE + product_file: /etc/products.d/openSUSE.prod + register_release: '' + register_target: openSUSE-13.1-x86_64 + relnotes_url: http://doc.opensuse.org/release-notes/x86_64/openSUSE/13.1/release-notes-op… + relnotes_urls: + - http://doc.opensuse.org/release-notes/x86_64/openSUSE/13.1/release-notes-op… + short_name: openSUSE + source: -1 + status: :installed + summary: openSUSE (installed on the system) + transact_by: :solver + type: base + update_urls: [] + upgrades: [] + vendor: openSUSE + version: 13.1-1.10 +- arch: x86_64 + category: base + description: openSUSE is a distribution by the openSUSE.org project. + display_name: openSUSE (LOCKED) + download_size: 0 + flags: [] + flavor: dvd-promo + inst_size: 0 + locked: true + medium_nr: 0 + name: openSUSE-locked + product_file: /etc/products.d/openSUSE.prod + register_release: '' + register_target: openSUSE-13.1-x86_64 + relnotes_url: http://doc.opensuse.org/release-notes/x86_64/openSUSE/13.1/release-notes-op… + relnotes_urls: + - http://doc.opensuse.org/release-notes/x86_64/openSUSE/13.1/release-notes-op… + short_name: openSUSE + source: -1 + status: :installed + summary: openSUSE (installed on the system) + transact_by: :user + type: base + update_urls: [] + upgrades: [] + vendor: openSUSE + version: 12.6-1.1.1.1 +- arch: x86_64 + category: base + description: openSUSE is a distribution by the openSUSE.org project. + display_name: openSUSE (selected for installation) + download_size: 0 + flags: [] + flavor: dvd-promo + inst_size: 0 + locked: false + medium_nr: 0 + name: openSUSE + product_file: /etc/products.d/openSUSE.prod + register_release: '' + register_target: openSUSE-13.1-x86_64 + relnotes_url: http://doc.opensuse.org/release-notes/x86_64/openSUSE/13.1/release-notes-op… + relnotes_urls: + - http://doc.opensuse.org/release-notes/x86_64/openSUSE/13.1/release-notes-op… + short_name: openSUSE + source: 0 + status: :selected + summary: openSUSE (selected for removal) + transact_by: :user + type: base + update_urls: [] + upgrades: [] + vendor: openSUSE + version: 13.1-1.10 +- arch: x86_64 + category: base + description: openSUSE is a distribution by the openSUSE.org project. + display_name: openSUSE (SELECTED) + download_size: 0 + flags: [] + flavor: dvd-promo + inst_size: 0 + locked: false + medium_nr: 0 + name: openSUSE + product_file: /etc/products.d/openSUSE.prod + register_release: '' + register_target: openSUSE-13.1-x86_64 + relnotes_url: http://doc.opensuse.org/release-notes/x86_64/openSUSE/13.1/release-notes-op… + relnotes_urls: + - http://doc.opensuse.org/release-notes/x86_64/openSUSE/13.1/release-notes-op… + short_name: openSUSE + source: 0 + status: :removed + summary: openSUSE (selected for installation) + transact_by: :app_high + type: base + update_urls: [] + upgrades: [] + vendor: openSUSE + version: 13.0-1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.9/test/packages_test.rb new/yast2-packager-3.1.12/test/packages_test.rb --- old/yast2-packager-3.1.9/test/packages_test.rb 2014-04-11 16:29:40.000000000 +0200 +++ new/yast2-packager-3.1.12/test/packages_test.rb 2014-04-28 16:09:49.000000000 +0200 @@ -3,10 +3,33 @@ ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) require "yast" +require "yaml" + +include Yast::Logger Yast.import "Packages" Yast.import "SCR" Yast.import "Product" +Yast.import "ProductFeatures" + +SCR_STRING_PATH = Yast::Path.new(".target.string") +SCR_BASH_PATH = Yast::Path.new(".target.bash") + +CHECK_FOR_DELL_SYSTEM = Regexp.new( + 'hwinfo .*bios .*grep .*vendor:.*dell inc', + Regexp::IGNORECASE +) + +# Path to a test data - service file - mocking the default data path +DATA_PATH = File.join(File.expand_path(File.dirname(__FILE__)), "data") + +def load_zypp(file_name) + file_name = File.join(DATA_PATH, "zypp", file_name) + log.info "Loading file: #{file_name}" + YAML.load_file(file_name) +end + +PRODUCTS_FROM_ZYPP = load_zypp('products.yml').freeze describe Yast::Packages do describe "#kernelCmdLinePackages" do @@ -16,40 +39,152 @@ Yast::Product.stub(:Product).and_return(nil) end - it "returns biosdevname within the list of packages as required by Kernel params" do - Yast::SCR.stub(:Read).with( - Yast::Path.new(".target.string"), - "/proc/cmdline" - ).and_return("install=cd:// vga=0x314 biosdevname=1") - expect(Yast::Packages.kernelCmdLinePackages.include?("biosdevname")).to be_true - end - - it "does not return biosdevname within the list of packages as not required by Kernel params" do - Yast::SCR.stub(:Read).with( - Yast::Path.new(".target.string"), - "/proc/cmdline" - ).and_return("install=cd:// vga=0x314 biosdevname=0") - expect(Yast::Packages.kernelCmdLinePackages.include?("biosdevname")).to be_false - end - - it "returns biosdevname within the list of packages if biosdevname not specified as Kernel parameter and if running on a Dell system" do - Yast::SCR.stub(:Read).with( - Yast::Path.new(".target.string"), - "/proc/cmdline" - ).and_return("install=cd:// vga=0x314") - # 0 means `grep` succeeded - Yast::SCR.stub(:Execute).and_return(0) - expect(Yast::Packages.kernelCmdLinePackages.include?("biosdevname")).to be_true - end - - it "does not return biosdevname within the list of packages if biosdevname not specified as Kernel parameter and if not running on a Dell system" do - Yast::SCR.stub(:Read).with( - Yast::Path.new(".target.string"), - "/proc/cmdline" - ).and_return("install=cd:// vga=0x314") - # 1 means `grep` has not succeeded - Yast::SCR.stub(:Execute).and_return(1) - expect(Yast::Packages.kernelCmdLinePackages.include?("biosdevname")).to be_false + context "when biosdevname behavior explicitly defined on the Kenel command line" do + it "returns biosdevname within the list of required packages" do + Yast::SCR.stub(:Read).with( + SCR_STRING_PATH,"/proc/cmdline" + ).and_return("install=cd:// vga=0x314 biosdevname=1") + expect(Yast::Packages.kernelCmdLinePackages.include?("biosdevname")).to be_true + end + + it "does not return biosdevname within the list of required packages" do + Yast::SCR.stub(:Read).with( + SCR_STRING_PATH,"/proc/cmdline" + ).and_return("install=cd:// vga=0x314 biosdevname=0") + expect(Yast::Packages.kernelCmdLinePackages.include?("biosdevname")).to be_false + end + end + + context "when biosdevname behavior not defined on the Kernel command line" do + context "and running on a Dell system" do + it "returns biosdevname within the list of packages" do + Yast::SCR.stub(:Read).with( + Yast::Path.new(".target.string"), + "/proc/cmdline" + ).and_return("install=cd:// vga=0x314") + # 0 means `grep` succeeded + Yast::SCR.stub(:Execute).with(SCR_BASH_PATH, CHECK_FOR_DELL_SYSTEM).and_return(0) + expect(Yast::Packages.kernelCmdLinePackages.include?("biosdevname")).to be_true + end + end + + context "and running on a non-Dell system" do + it "does not return biosdevname within the list of packages" do + Yast::SCR.stub(:Read).with( + Yast::Path.new(".target.string"), + "/proc/cmdline" + ).and_return("install=cd:// vga=0x314") + # 1 means `grep` has not succeeded + Yast::SCR.stub(:Execute).with(SCR_BASH_PATH, CHECK_FOR_DELL_SYSTEM).and_return(1) + expect(Yast::Packages.kernelCmdLinePackages.include?("biosdevname")).to be_false + end + end + end + + end + + describe "#default_patterns" do + context "software->default_patterns is not defined in control file" do + it "returns empty list" do + Yast::ProductFeatures.stub(:GetStringFeature).with("software", "default_patterns").and_return("") + expect(Yast::Packages.default_patterns).to be_empty + end + end + + context "software->default_patterns is filled with list of patterns" do + it "returns list of patterns" do + Yast::ProductFeatures.stub(:GetStringFeature).with("software", "default_patterns").and_return("a,b,c,d") + expect(Yast::Packages.default_patterns).to eq(["a", "b", "c", "d"]) + + Yast::ProductFeatures.stub(:GetStringFeature).with("software", "default_patterns").and_return("a b c d") + expect(Yast::Packages.default_patterns).to eq(["a", "b", "c", "d"]) + + Yast::ProductFeatures.stub(:GetStringFeature).with("software", "default_patterns").and_return(" a ,b , c,d ") + expect(Yast::Packages.default_patterns).to eq(["a", "b", "c", "d"]) + + Yast::ProductFeatures.stub(:GetStringFeature).with("software", "default_patterns").and_return(" a ,b \n, c\n,d ") + expect(Yast::Packages.default_patterns).to eq(["a", "b", "c", "d"]) + end + end + end + + DEFAULT_PATTERN = { + "name" => "name", + "version" => "1.0.0", + "status" => :available, + "transact_by" => :app_high, + } + + def pattern(properties = {}) + DEFAULT_PATTERN.merge(properties) + end + + describe "#SelectSystemPatterns" do + context "if this is the initial run or it is being reinitialized" do + context "and patterns are not unselected by user" do + it "selects patterns for installation" do + Yast::Packages.stub(:patterns_to_install).and_return(["p1", "p2", "p3"]) + Yast::Pkg.stub(:ResolvableProperties).and_return( + [pattern({ "name" => "p1" })], + [pattern({ "name" => "p2" })], + [pattern({ "name" => "p3" })] + ) + + allow(Yast::Pkg).to receive(:ResolvableInstall).with(/\Ap[1-3]/, :pattern).exactly(3).times.and_return(true) + Yast::Packages.SelectSystemPatterns(false) + end + end + + context "and some patterns are already unselected by user" do + it "selects patterns for installation that were not unselected by user already" do + Yast::Packages.stub(:patterns_to_install).and_return(["p1", "p2", "p3"]) + Yast::Pkg.stub(:ResolvableProperties).and_return( + [pattern({ "name" => "p1", "transact_by" => :user })], + [pattern({ "name" => "p2", "transact_by" => :user })], + [pattern({ "name" => "p3" })] + ) + + expect(Yast::Pkg).not_to receive(:ResolvableInstall).with("p1", :pattern) + expect(Yast::Pkg).not_to receive(:ResolvableInstall).with("p2", :pattern) + expect(Yast::Pkg).to receive(:ResolvableInstall).with("p3", :pattern).once.and_return(true) + Yast::Packages.SelectSystemPatterns(false) + end + end + end + + context "if this is a subsequent run" do + it "re-selects all patterns already selected for installation" do + Yast::Packages.stub(:patterns_to_install).and_return(["p1", "p2", "p3"]) + Yast::Pkg.stub(:ResolvableProperties).and_return( + [pattern({ "name" => "p1", "transact_by" => :user, "status" => :selected })], + [pattern({ "name" => "p2", "transact_by" => :user, "status" => :selected })], + [pattern({ "name" => "p3" })] + ) + + expect(Yast::Pkg).to receive(:ResolvableRemove).with(/\Ap[1-2]/, :pattern).twice.and_return(true) + expect(Yast::Pkg).not_to receive(:ResolvableInstall).with("p3", :pattern) + Yast::Packages.SelectSystemPatterns(true) + end + end + + it "raises an exception if pattern is not found" do + Yast::Packages.stub(:patterns_to_install).and_return(["p1", "p2", "p3"]) + Yast::Pkg.stub(:ResolvableProperties).and_return([]) + expect{ Yast::Packages.SelectSystemPatterns(false) }.to raise_error(/pattern/i) + expect{ Yast::Packages.SelectSystemPatterns(true) }.to raise_error(/pattern/i) + end + end + + describe "#log_software_selection" do + it "logs all currently changed resolvables set by user or application (excluding solver)" do + Yast::Pkg.stub(:ResolvableProperties).and_return([]) + Yast::Pkg.stub(:ResolvableProperties).with("", :product, "").and_return(PRODUCTS_FROM_ZYPP.dup) + + expect(Yast::Y2Logger.instance).to receive(:info) do |msg| + expect(msg).to match(/(transaction status [begin|end]|(locked)?resolvables of type .* set by .*|:name=>.*:version=>)/i) + end.exactly(8).times.and_call_original + + expect(Yast::Packages.log_software_selection).to be_nil end end end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package branding-openSUSE for openSUSE:Factory checked in at 2014-05-06 13:40:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "branding-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/branding-openSUSE/branding-openSUSE.changes 2014-03-01 21:20:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.branding-openSUSE.new/branding-openSUSE.changes 2014-05-06 13:40:31.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 25 15:51:12 UTC 2014 - rbrownccb(a)opensuse.org + +- Update YaST installer look to similar to sle12 + +------------------------------------------------------------------- kde-branding-openSUSE.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ kde-branding-openSUSE.spec: same change ++++++ openSUSE.tar.xz ++++++ /work/SRC/openSUSE:Factory/branding-openSUSE/openSUSE.tar.xz /work/SRC/openSUSE:Factory/.branding-openSUSE.new/openSUSE.tar.xz differ: char 25, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libyui-qt for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package libyui-qt for openSUSE:Factory checked in at 2014-05-06 13:40:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt (Old) and /work/SRC/openSUSE:Factory/.libyui-qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-qt" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt/libyui-qt.changes 2014-04-13 13:13:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui-qt.new/libyui-qt.changes 2014-05-06 13:40:29.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Apr 17 07:13:17 UTC 2014 - jsrain(a)suse.cz + +- added title bar with product logo (bnc#868722) +- 2.46.7 + +------------------------------------------------------------------- +Mon Apr 14 15:11:09 CEST 2014 - tgoettlicher(a)suse.de + +- Improve styleability of dialog heading +- 2.46.6 + +------------------------------------------------------------------- Old: ---- libyui-qt-2.46.5.tar.bz2 New: ---- libyui-qt-2.46.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-doc.spec ++++++ --- /var/tmp/diff_new_pack.jtB6fG/_old 2014-05-06 13:40:30.000000000 +0200 +++ /var/tmp/diff_new_pack.jtB6fG/_new 2014-05-06 13:40:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-qt-doc -Version: 2.46.5 +Version: 2.46.7 Release: 0 Source: libyui-qt-%{version}.tar.bz2 ++++++ libyui-qt.spec ++++++ --- /var/tmp/diff_new_pack.jtB6fG/_old 2014-05-06 13:40:30.000000000 +0200 +++ /var/tmp/diff_new_pack.jtB6fG/_new 2014-05-06 13:40:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-qt -Version: 2.46.5 +Version: 2.46.7 Release: 0 Source: libyui-qt-%{version}.tar.bz2 @@ -26,7 +26,7 @@ BuildRequires: gcc-c++ BuildRequires: pkg-config -%define libyui_devel_version libyui-devel >= 3.0.4 +%define libyui_devel_version libyui-devel >= 3.1.2 BuildRequires: %{libyui_devel_version} BuildRequires: fontconfig-devel BuildRequires: pkgconfig(Qt5Core) ++++++ libyui-qt-2.46.5.tar.bz2 -> libyui-qt-2.46.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.5/ChangeLog new/libyui-qt-2.46.7/ChangeLog --- old/libyui-qt-2.46.5/ChangeLog 2014-04-10 11:25:37.000000000 +0200 +++ new/libyui-qt-2.46.7/ChangeLog 2014-04-18 13:40:41.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Thu Apr 17 07:13:17 UTC 2014 - jsrain(a)suse.cz + +- added title bar with product logo (bnc#868722) +- 2.46.7 + +------------------------------------------------------------------- +Mon Apr 14 15:11:09 CEST 2014 - tgoettlicher(a)suse.de + +- Improve styleability of dialog heading +- 2.46.6 + +------------------------------------------------------------------- Tue Apr 8 13:17:38 UTC 2014 - mvidner(a)suse.com - Enable wizard title on the left instead of on top (bnc#868859). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.5/VERSION.cmake new/libyui-qt-2.46.7/VERSION.cmake --- old/libyui-qt-2.46.5/VERSION.cmake 2014-04-10 11:25:37.000000000 +0200 +++ new/libyui-qt-2.46.7/VERSION.cmake 2014-04-18 13:40:41.000000000 +0200 @@ -1,6 +1,6 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "46") -SET(VERSION_PATCH "5") +SET(VERSION_PATCH "7") SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.5/libyui-qt.spec.in new/libyui-qt-2.46.7/libyui-qt.spec.in --- old/libyui-qt-2.46.5/libyui-qt.spec.in 2014-03-12 16:11:26.000000000 +0100 +++ new/libyui-qt-2.46.7/libyui-qt.spec.in 2014-04-18 13:40:41.000000000 +0200 @@ -26,7 +26,7 @@ BuildRequires: gcc-c++ BuildRequires: pkg-config -%define libyui_devel_version libyui-devel >= 3.0.4 +%define libyui_devel_version libyui-devel >= 3.1.2 BuildRequires: %{libyui_devel_version} BuildRequires: fontconfig-devel BuildRequires: pkgconfig(Qt5Core) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.5/src/YQWizard.cc new/libyui-qt-2.46.7/src/YQWizard.cc --- old/libyui-qt-2.46.5/src/YQWizard.cc 2014-04-10 11:25:37.000000000 +0200 +++ new/libyui-qt-2.46.7/src/YQWizard.cc 2014-04-18 13:40:41.000000000 +0200 @@ -128,6 +128,7 @@ _clientArea = 0; _menuBar = 0; _dialogIcon = 0; + _dialogLogo = 0; _dialogHeading = 0; _contents = 0; _backButton = 0; @@ -682,13 +683,33 @@ QWidget *YQWizard::layoutWorkArea( QWidget * parent ) { _workArea = new QFrame( parent ); - _workArea->setObjectName( "work_area" ); - - QY2Styler::styler()->registerChildWidget( this, _workArea ); QVBoxLayout *vbox = new QVBoxLayout( _workArea ); YUI_CHECK_NEW( vbox ); + // add the logo on the top + if (YUI::application()->showProductLogo()) + { + QWidget * logoWidget = new QWidget; + logoWidget->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert + logoWidget->setObjectName("LogoHBox"); + vbox->addWidget( logoWidget ); + + QHBoxLayout * logoHBox = new QHBoxLayout(logoWidget); + YUI_CHECK_NEW( logoHBox ); + + _dialogLogo = new QLabel( _workArea ); + YUI_CHECK_NEW( _dialogLogo ); + logoHBox->addWidget( _dialogLogo ); + _dialogLogo->setObjectName( "DialogLogo" ); + _dialogLogo->setAlignment( Qt::AlignLeft ); + QY2Styler::styler()->registerChildWidget( this, _dialogLogo ); + _dialogLogo->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert + _dialogLogo->setMinimumHeight(59); // FIXME: control size via stylesheet, did not find how + _dialogLogo->setMinimumWidth(100); + logoHBox->addStretch(); + } + // // Menu bar // @@ -699,6 +720,13 @@ _menuBar->hide(); // will be made visible when menus are added vbox->addWidget( _menuBar ); + QWidget * dialog_inner_area = new QWidget (_workArea); + dialog_inner_area->setObjectName( "work_area" ); + + QY2Styler::styler()->registerChildWidget( this, dialog_inner_area ); + QVBoxLayout * inner_vbox = new QVBoxLayout(dialog_inner_area); + YUI_CHECK_NEW( inner_vbox ); + vbox->addWidget (dialog_inner_area); QVBoxLayout *innerbox = new QVBoxLayout( _workArea ); QVBoxLayout *leftInnerBox = innerbox; @@ -707,7 +735,7 @@ innerbox->setMargin ( YQWidgetMargin ); - vbox->addLayout(innerbox); + inner_vbox->addLayout(innerbox); vbox->setMargin( 0 ); @@ -744,11 +772,10 @@ _dialogHeading = new QLabel( _workArea ); YUI_CHECK_NEW( _dialogHeading ); headingHBox->addWidget( _dialogHeading ); - _dialogHeading->setAlignment( Qt::AlignLeft ); _dialogHeading->setWordWrap( true ); _dialogHeading->setTextFormat( Qt::PlainText ); _dialogHeading->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); // hor/vert - _dialogHeading->setObjectName( "DialogHeading" ); + _dialogHeading->setObjectName( (titleIsOnTheLeft())? "DialogHeadingLeft" : "DialogHeadingTop" ) ; // // Client area (the part that belongs to the YCP application) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.5/src/YQWizard.h new/libyui-qt-2.46.7/src/YQWizard.h --- old/libyui-qt-2.46.5/src/YQWizard.h 2014-04-10 11:25:38.000000000 +0200 +++ new/libyui-qt-2.46.7/src/YQWizard.h 2014-04-18 13:40:41.000000000 +0200 @@ -585,6 +585,7 @@ QWidget * _clientArea; QMenuBar * _menuBar; QLabel * _dialogIcon; + QLabel * _dialogLogo; QLabel * _dialogHeading; YQAlignment * _contents; YQWizardButton * _backButton; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libyui for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package libyui for openSUSE:Factory checked in at 2014-05-06 13:40:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui (Old) and /work/SRC/openSUSE:Factory/.libyui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui/libyui.changes 2014-04-13 13:13:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui.new/libyui.changes 2014-05-06 13:40:27.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Apr 17 07:01:08 UTC 2014 - jsrain(a)suse.cz + +- Added handling of logo bar in wizard (bnc#868722) +- 3.1.2 + +------------------------------------------------------------------- +Wed Apr 16 14:20:41 UTC 2014 - mvidner(a)suse.com + +- Fix YQUI destruction (bnc#867296). +- 3.1.1 + +------------------------------------------------------------------- Old: ---- libyui-3.1.0.tar.bz2 New: ---- libyui-3.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-doc.spec ++++++ --- /var/tmp/diff_new_pack.FJ345s/_old 2014-05-06 13:40:28.000000000 +0200 +++ /var/tmp/diff_new_pack.FJ345s/_new 2014-05-06 13:40:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-doc -Version: 3.1.0 +Version: 3.1.2 Release: 0 Source: libyui-%{version}.tar.bz2 ++++++ libyui.spec ++++++ --- /var/tmp/diff_new_pack.FJ345s/_old 2014-05-06 13:40:28.000000000 +0200 +++ /var/tmp/diff_new_pack.FJ345s/_new 2014-05-06 13:40:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui -Version: 3.1.0 +Version: 3.1.2 Release: 0 Source: libyui-%{version}.tar.bz2 ++++++ libyui-3.1.0.tar.bz2 -> libyui-3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.0/ChangeLog new/libyui-3.1.2/ChangeLog --- old/libyui-3.1.0/ChangeLog 2014-04-10 11:27:37.000000000 +0200 +++ new/libyui-3.1.2/ChangeLog 2014-04-18 13:07:40.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Thu Apr 17 07:01:08 UTC 2014 - jsrain(a)suse.cz + +- Added handling of logo bar in wizard (bnc#868722) +- 3.1.2 + +------------------------------------------------------------------- +Wed Apr 16 14:20:41 UTC 2014 - mvidner(a)suse.com + +- Fix YQUI destruction (bnc#867296). +- 3.1.1 + +------------------------------------------------------------------- Wed Apr 9 12:44:17 UTC 2014 - mvidner(a)suse.com - Added YUIOpt_titleOnLeft, YWizardMode_TitleOnLeft (bnc#868859) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.0/Rakefile new/libyui-3.1.2/Rakefile --- old/libyui-3.1.0/Rakefile 2014-03-12 15:47:44.000000000 +0100 +++ new/libyui-3.1.2/Rakefile 2014-04-22 17:47:44.000000000 +0200 @@ -13,10 +13,17 @@ Packaging.configuration do |conf| spec_template = Dir.glob("*.spec.{in,cmake}").first - conf.obs_project = "devel:libraries:libyui" - conf.obs_sr_project = "openSUSE:Factory" + if ENV["LIBYUI_SUBMIT"] == "SLES" + conf.obs_api = "https://api.suse.de/" + conf.obs_project = "Devel:YaST:Head" + conf.obs_target = "SLE-12" + conf.obs_sr_project = "SUSE:SLE-12:GA" + else + conf.obs_project = "devel:libraries:libyui" + conf.obs_sr_project = "openSUSE:Factory" + end conf.package_name = spec_template[/(.*)\.spec\..*/, 1] - conf.package_dir = "#{BUILDDIR}/package" + conf.package_dir = "#{BUILDDIR}/package" conf.skip_license_check << /.*/ if conf.package_name =~ /gtk|bindings/ conf.skip_license_check << /bootstrap.sh|ChangeLog|Makefile.cvs/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.0/VERSION.cmake new/libyui-3.1.2/VERSION.cmake --- old/libyui-3.1.0/VERSION.cmake 2014-04-10 11:27:37.000000000 +0200 +++ new/libyui-3.1.2/VERSION.cmake 2014-04-18 13:07:40.000000000 +0200 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "3") SET( VERSION_MINOR "1" ) -SET( VERSION_PATCH "0" ) +SET( VERSION_PATCH "2" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.0/src/Notes.h new/libyui-3.1.2/src/Notes.h --- old/libyui-3.1.0/src/Notes.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-3.1.2/src/Notes.h 2014-04-17 10:45:29.000000000 +0200 @@ -0,0 +1,43 @@ +/* + Copyright (C) 2014 SUSE LLC + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) version 3.0 of the License. This library + 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 Lesser General Public + License for more details. You should have received a copy of the GNU + Lesser General Public License along with this library; if not, write + to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + Floor, Boston, MA 02110-1301 USA +*/ +/** +@page notes1 Notes about Initialization + +@section Important entry points + +- YUI::widgetFactory() +- YUI::ui() + +@section What happens on initialization + +YUI::ui() +calls YUI::ensureUICreated() +calls YUILoader::loadUI +calls YUILoader::loadPlugin. +That instantiates YUIPlugin(string plugin_name) and +calls its YUIPlugin::locateSymbol "_Z8createUIb" + (mangled createUI(bool) ) +to produce a YUI * (* createUIFunction_t)(bool withThreads) +which is called. Its result is discarded, but YUI::_ui gets initialized +by the YUI::YUI ctor called by the derived ctor. + +YUIPlugin calls dlopen, but dlclose is not called by default, +and actually proably never. + +@section Utility classes + +- YCommandLine + + */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.0/src/YApplication.cc new/libyui-3.1.2/src/YApplication.cc --- old/libyui-3.1.0/src/YApplication.cc 2014-02-18 17:12:09.000000000 +0100 +++ new/libyui-3.1.2/src/YApplication.cc 2014-04-18 13:07:40.000000000 +0200 @@ -46,6 +46,7 @@ YApplicationPrivate() : productName( "openSUSE" ) , reverseLayout( false ) + , showProductLogo( false ) {} std::string productName; @@ -55,6 +56,7 @@ YFunctionKeyMap defaultFunctionKey; YIconLoader* iconLoader; std::map<std::string,std::string> releaseNotes; + bool showProductLogo; }; @@ -132,6 +134,18 @@ } void +YApplication::setShowProductLogo( bool show ) +{ + priv->showProductLogo = show; +} + +bool +YApplication::showProductLogo() const +{ + return priv->showProductLogo; +} + +void YApplication::setReverseLayout( bool reverse ) { priv->reverseLayout = reverse; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.0/src/YApplication.h new/libyui-3.1.2/src/YApplication.h --- old/libyui-3.1.0/src/YApplication.h 2014-02-18 17:12:09.000000000 +0100 +++ new/libyui-3.1.2/src/YApplication.h 2014-04-18 13:07:40.000000000 +0200 @@ -263,6 +263,16 @@ std::map<std::string,std::string> releaseNotes() const; /** + * Set whether the product logo (in top bar) should be shown + */ + void setShowProductLogo( bool show ); + + /** + * Return true if product logo should be shown + */ + bool showProductLogo() const; + + /** * Convert logical layout spacing units into device dependent units. * A default size dialog is assumed to be 80x25 layout spacing units. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.0/src/YUI.cc new/libyui-3.1.2/src/YUI.cc --- old/libyui-3.1.0/src/YUI.cc 2014-02-18 17:12:09.000000000 +0100 +++ new/libyui-3.1.2/src/YUI.cc 2014-04-17 10:45:29.000000000 +0200 @@ -494,52 +494,4 @@ return 0; } - -// -// ---------------------------------------------------------------------- -// - - -/** - * Helper class to make sure the UI is properly shut down. - **/ -class YUITerminator -{ -public: - YUITerminator() {} - - /** - * Destructor. - * - * If there still is a UI, it will be deleted. - * If there is none, this will do nothing. - **/ - ~YUITerminator(); -}; - - -YUITerminator::~YUITerminator() -{ - if ( YUI::_ui ) - { - yuiMilestone() << "Shutting down UI" << endl; - delete YUI::_ui; - - YUI::_ui = 0; - } -} - - -/** - * Static YUITerminator instance: It will make sure the UI is deleted in its - * global destructor. If the UI is already destroyed, it will do nothing. If - * there still is a UI object, it will be deleted. - * - * This is particularly important for the NCurses UI so the terminal settings - * are properly restored. - **/ -static YUITerminator uiTerminator; - - - // EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.0/src/YUI.h new/libyui-3.1.2/src/YUI.h --- old/libyui-3.1.0/src/YUI.h 2014-02-18 17:12:09.000000000 +0100 +++ new/libyui-3.1.2/src/YUI.h 2014-04-17 10:45:29.000000000 +0200 @@ -48,7 +48,7 @@ class YUI { friend class YUIFunction; - friend class YUITerminator; + friend class YUILoader; protected: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.0/src/YUILoader.cc new/libyui-3.1.2/src/YUILoader.cc --- old/libyui-3.1.0/src/YUILoader.cc 2014-02-18 17:12:09.000000000 +0100 +++ new/libyui-3.1.2/src/YUILoader.cc 2014-04-17 10:45:29.000000000 +0200 @@ -27,6 +27,8 @@ #include <sys/stat.h> #include <string.h> +#define YUILogComponent "ui" +#include "YUILog.h" #include "YCommandLine.h" #include "YUILoader.h" #include "YUIPlugin.h" @@ -95,6 +97,16 @@ } } +void YUILoader::deleteUI() +{ + if ( YUI::_ui ) + { + yuiMilestone() << "Shutting down UI" << std::endl; + delete YUI::_ui; + + YUI::_ui = 0; + } +} void YUILoader::loadPlugin( const std::string & name, bool withThreads ) { @@ -108,6 +120,14 @@ { YUI * ui = createUI( withThreads ); // no threads + // At this point the concrete UI will have loaded its own + // internal plugins and registered their destructors. + // Our destructor must get called before those get dlclose'd. + // + // Formerly ~YUI was called quite late, which called ~YQUI + // and that ran code in the already unloaded Qt internal plugins. + atexit(deleteUI); + if ( ui ) return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.0/src/YUILoader.h new/libyui-3.1.2/src/YUILoader.h --- old/libyui-3.1.0/src/YUILoader.h 2014-02-18 17:12:09.000000000 +0100 +++ new/libyui-3.1.2/src/YUILoader.h 2014-04-17 10:45:29.000000000 +0200 @@ -53,6 +53,16 @@ static void loadUI( bool withThreads = false ); /** + * This will make sure the UI singleton is deleted. + * If the UI is already destroyed, it will do nothing. If + * there still is a UI object, it will be deleted. + * + * This is particularly important for the NCurses UI so that + * the terminal settings are properly restored. + **/ + static void deleteUI(); + + /** * Load a UI plug-in. 'name' is one of the YUIPlugin_ -defines above. * * This might throw exceptions. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit autoyast2 for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2014-05-06 13:40:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autoyast2" Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2014-04-05 14:43:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2014-05-06 13:40:25.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Apr 22 10:17:55 CEST 2014 - locilka(a)suse.com + +- Replaced old Product.patterns with new Packages.default_patterns + (bnc#873923) +- 3.1.24 + +------------------------------------------------------------------- +Thu Apr 17 15:05:11 CEST 2014 - tgoettlicher(a)suse.de + +- added disklabel for autoyast.xml needed for gpt partition + tables (bnc#873766) +- 3.1.23 + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.22.tar.bz2 New: ---- autoyast2-3.1.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.NbKqGP/_old 2014-05-06 13:40:26.000000000 +0200 +++ /var/tmp/diff_new_pack.NbKqGP/_new 2014-05-06 13:40:26.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.22 +Version: 3.1.24 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -89,7 +89,8 @@ Requires: yast2-core Requires: yast2-country Requires: yast2-ncurses -Requires: yast2-packager +# Packages.default_patterns +Requires: yast2-packager >= 3.1.10 # ServicesManagerTargetClass::BaseTargets Requires: yast2-services-manager >= 3.1.10 Requires: yast2-slp ++++++ autoyast2-3.1.22.tar.bz2 -> autoyast2-3.1.24.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.22/package/autoyast2.changes new/autoyast2-3.1.24/package/autoyast2.changes --- old/autoyast2-3.1.22/package/autoyast2.changes 2014-04-03 11:19:49.000000000 +0200 +++ new/autoyast2-3.1.24/package/autoyast2.changes 2014-04-22 10:35:43.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Tue Apr 22 10:17:55 CEST 2014 - locilka(a)suse.com + +- Replaced old Product.patterns with new Packages.default_patterns + (bnc#873923) +- 3.1.24 + +------------------------------------------------------------------- +Thu Apr 17 15:05:11 CEST 2014 - tgoettlicher(a)suse.de + +- added disklabel for autoyast.xml needed for gpt partition + tables (bnc#873766) +- 3.1.23 + +------------------------------------------------------------------- Thu Apr 3 10:33:34 CEST 2014 - tgoettlicher(a)suse.de - removed check for "eth" prefix for network devices (bnc#871090) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.22/package/autoyast2.spec new/autoyast2-3.1.24/package/autoyast2.spec --- old/autoyast2-3.1.22/package/autoyast2.spec 2014-04-03 11:19:49.000000000 +0200 +++ new/autoyast2-3.1.24/package/autoyast2.spec 2014-04-22 10:35:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.22 +Version: 3.1.24 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -89,7 +89,8 @@ Requires: yast2-core Requires: yast2-country Requires: yast2-ncurses -Requires: yast2-packager +# Packages.default_patterns +Requires: yast2-packager >= 3.1.10 # ServicesManagerTargetClass::BaseTargets Requires: yast2-services-manager >= 3.1.10 Requires: yast2-slp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.22/src/clients/inst_autosetup_upgrade.rb new/autoyast2-3.1.24/src/clients/inst_autosetup_upgrade.rb --- old/autoyast2-3.1.22/src/clients/inst_autosetup_upgrade.rb 2014-04-03 11:19:50.000000000 +0200 +++ new/autoyast2-3.1.24/src/clients/inst_autosetup_upgrade.rb 2014-04-22 10:35:43.000000000 +0200 @@ -9,6 +9,8 @@ # $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $ module Yast class InstAutosetupUpgradeClient < Client + include Yast::Logger + def main Yast.import "Pkg" Yast.import "UI" @@ -286,18 +288,12 @@ Builtins.foreach(@restore) { |res| Pkg.ResolvableInstall(res, :product) } Update.SetDesktopPattern if !Update.onlyUpdateInstalled - if !Update.onlyUpdateInstalled && # just consider already installed packages - !ProductFeatures.GetBooleanFeature( - "software", - "only_update_installed" - ) - Builtins.foreach(Product.patterns) do |pat| - Builtins.y2milestone("Pre-select pattern %1", pat) - Pkg.ResolvableInstall(pat, :pattern) + if !Update.OnlyUpdateInstalled + Packages.default_patterns.each do |pattern| + log.info "Pre-select pattern #{pattern}: " << Pkg.ResolvableInstall(pattern, :pattern) end end - Packages.SelectProduct # bnc #382208 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.22/src/modules/AutoinstDrive.rb new/autoyast2-3.1.24/src/modules/AutoinstDrive.rb --- old/autoyast2-3.1.22/src/modules/AutoinstDrive.rb 2014-04-03 11:19:50.000000000 +0200 +++ new/autoyast2-3.1.24/src/modules/AutoinstDrive.rb 2014-04-22 10:35:43.000000000 +0200 @@ -31,7 +31,8 @@ "partitions" => [], # list of partitions on this drive "type" => :CT_DISK, # type of drive, see diskTypes below "use" => :all, # `all, `linux, `free, or list of partition numbers to use - "pesize" => "" + "pesize" => "", + "disklabel" => "msdos" # type of partition table (msdos or gpt) } # size of physical extents (currently no GUI support for this setting) # Every drive created gets an id. @@ -356,6 +357,11 @@ Builtins.y2error("Couldn't construct PartitionT from '%1'", part) end end + newDrive = set( + newDrive, + "disklabel", + Ops.get_string(drive, "disklabel", "msdos") + ) deep_copy(newDrive) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.22/src/modules/AutoinstPartPlan.rb new/autoyast2-3.1.24/src/modules/AutoinstPartPlan.rb --- old/autoyast2-3.1.22/src/modules/AutoinstPartPlan.rb 2014-04-03 11:19:50.000000000 +0200 +++ new/autoyast2-3.1.24/src/modules/AutoinstPartPlan.rb 2014-04-22 10:35:43.000000000 +0200 @@ -586,6 +586,7 @@ # they must exist drive = {} Ops.set(drive, "type", Ops.get_symbol(v, "type", :CT_DISK)) + Ops.set(drive, "disklabel", Ops.get_string(v, "label", "msdos")) if no_create partitions = Builtins.maplist( Convert.convert(partitions, :from => "list", :to => "list <map>") -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ycp-ui-bindings for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package yast2-ycp-ui-bindings for openSUSE:Factory checked in at 2014-05-06 13:40:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ycp-ui-bindings (Old) and /work/SRC/openSUSE:Factory/.yast2-ycp-ui-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ycp-ui-bindings" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ycp-ui-bindings/yast2-ycp-ui-bindings.changes 2014-04-13 13:13:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-ycp-ui-bindings.new/yast2-ycp-ui-bindings.changes 2014-05-06 13:40:24.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 17 08:01:25 UTC 2014 - jsrain(a)suse.cz + +- Added built-in for setting wizard logo (bnc#868722) +- 3.1.7 + +------------------------------------------------------------------- Old: ---- yast2-ycp-ui-bindings-3.1.6.tar.bz2 New: ---- yast2-ycp-ui-bindings-3.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ycp-ui-bindings.spec ++++++ --- /var/tmp/diff_new_pack.K8zfU8/_old 2014-05-06 13:40:25.000000000 +0200 +++ /var/tmp/diff_new_pack.K8zfU8/_new 2014-05-06 13:40:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ycp-ui-bindings -Version: 3.1.6 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,7 +41,7 @@ Conflicts: yast2 < 2.23.0 Conflicts: yast2-libyui < 2.42.0 -BuildRequires: libyui-devel >= 3.0.11 +BuildRequires: libyui-devel >= 3.1.2 # libyui ImplPtr BuildRequires: boost-devel ++++++ yast2-ycp-ui-bindings-3.1.6.tar.bz2 -> yast2-ycp-ui-bindings-3.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ycp-ui-bindings-3.1.6/package/yast2-ycp-ui-bindings.changes new/yast2-ycp-ui-bindings-3.1.7/package/yast2-ycp-ui-bindings.changes --- old/yast2-ycp-ui-bindings-3.1.6/package/yast2-ycp-ui-bindings.changes 2014-04-11 11:11:35.000000000 +0200 +++ new/yast2-ycp-ui-bindings-3.1.7/package/yast2-ycp-ui-bindings.changes 2014-04-18 13:42:41.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 17 08:01:25 UTC 2014 - jsrain(a)suse.cz + +- Added built-in for setting wizard logo (bnc#868722) +- 3.1.7 + +------------------------------------------------------------------- Wed Apr 9 12:53:42 UTC 2014 - mvidner(a)suse.com - Enable wizard title on the left instead of on top (bnc#868859) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ycp-ui-bindings-3.1.6/package/yast2-ycp-ui-bindings.spec new/yast2-ycp-ui-bindings-3.1.7/package/yast2-ycp-ui-bindings.spec --- old/yast2-ycp-ui-bindings-3.1.6/package/yast2-ycp-ui-bindings.spec 2014-04-11 11:11:35.000000000 +0200 +++ new/yast2-ycp-ui-bindings-3.1.7/package/yast2-ycp-ui-bindings.spec 2014-04-18 13:42:41.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ycp-ui-bindings -Version: 3.1.6 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -43,7 +43,7 @@ Conflicts: yast2 < 2.23.0 Conflicts: yast2-libyui < 2.42.0 -BuildRequires: libyui-devel >= 3.0.11 +BuildRequires: libyui-devel >= 3.1.2 # libyui ImplPtr BuildRequires: boost-devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ycp-ui-bindings-3.1.6/src/YCP_UI.cc new/yast2-ycp-ui-bindings-3.1.7/src/YCP_UI.cc --- old/yast2-ycp-ui-bindings-3.1.6/src/YCP_UI.cc 2014-04-11 11:11:35.000000000 +0200 +++ new/yast2-ycp-ui-bindings-3.1.7/src/YCP_UI.cc 2014-04-18 13:42:41.000000000 +0200 @@ -1665,5 +1665,15 @@ return YCPVoid(); } +YCPValue YCP_UI::SetProductLogo( const YCPBoolean & show_logo ) +{ + yuiMilestone() << "Setting heading log to " << show_logo << std::endl; + + YUI::application()->setShowProductLogo( show_logo->value() ); + + return YCPVoid(); +} + + // EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ycp-ui-bindings-3.1.6/src/YCP_UI.h new/yast2-ycp-ui-bindings-3.1.7/src/YCP_UI.h --- old/yast2-ycp-ui-bindings-3.1.6/src/YCP_UI.h 2014-04-11 11:11:35.000000000 +0200 +++ new/yast2-ycp-ui-bindings-3.1.7/src/YCP_UI.h 2014-04-18 13:42:41.000000000 +0200 @@ -98,6 +98,8 @@ static YCPValue PollInput (); static YCPBoolean TextMode (); static YCPValue SetReleaseNotes ( const YCPMap & relnotes ); + static YCPValue SetProductLogo ( const YCPBoolean & show_logo); + /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ycp-ui-bindings-3.1.6/src/YUINamespace.cc new/yast2-ycp-ui-bindings-3.1.7/src/YUINamespace.cc --- old/yast2-ycp-ui-bindings-3.1.6/src/YUINamespace.cc 2014-04-11 11:11:35.000000000 +0200 +++ new/yast2-ycp-ui-bindings-3.1.7/src/YUINamespace.cc 2014-04-18 13:42:41.000000000 +0200 @@ -247,6 +247,17 @@ YCPValue +YUINamespace::SetProductLogo( const YCPBoolean & show_logo) +{ + if ( YUIComponent::ui() ) + return YCP_UI::SetProductLogo( show_logo ); + else + return YCPVoid(); +} + + + +YCPValue YUINamespace::ChangeWidget( const YCPTerm & widget_id, const YCPSymbol & property, const YCPValue & new_value ) { if ( YUIComponent::ui() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ycp-ui-bindings-3.1.6/src/YUINamespace.h new/yast2-ycp-ui-bindings-3.1.7/src/YUINamespace.h --- old/yast2-ycp-ui-bindings-3.1.6/src/YUINamespace.h 2014-04-11 11:11:35.000000000 +0200 +++ new/yast2-ycp-ui-bindings-3.1.7/src/YUINamespace.h 2014-04-18 13:42:41.000000000 +0200 @@ -316,6 +316,9 @@ /* TYPEINFO: void (map<any,any>) */ YCPValue SetReleaseNotes( const YCPMap & relnotes ); + /* TYPEINFO: void(boolean) */ + YCPValue SetProductLogo( const YCPBoolean & show_logo); + YCPValue -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libstorage for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2014-05-06 13:39:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage (Old) and /work/SRC/openSUSE:Factory/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage" Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2014-04-26 11:45:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2014-05-06 13:39:50.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 05 16:12:16 CEST 2014 - aschnell(a)suse.de + +- fixed parsing of /proc/mdstat to properly detect IMSM and DDF + containers (bnc#858226) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-2.25.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.12/storage/SystemInfo/ProcMdstat.cc new/libstorage-2.25.12/storage/SystemInfo/ProcMdstat.cc --- old/libstorage-2.25.12/storage/SystemInfo/ProcMdstat.cc 2014-03-13 14:54:46.000000000 +0100 +++ new/libstorage-2.25.12/storage/SystemInfo/ProcMdstat.cc 2014-05-05 16:29:25.000000000 +0200 @@ -121,7 +121,7 @@ if( (pos=line.find_first_not_of( app_ws ))!=string::npos && pos!=0 ) line.erase( 0, pos ); } - else if( !entry.inactive ) + else { entry.is_container = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.12/testsuite/single.out/proc-mdstat.out new/libstorage-2.25.12/testsuite/single.out/proc-mdstat.out --- old/libstorage-2.25.12/testsuite/single.out/proc-mdstat.out 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.12/testsuite/single.out/proc-mdstat.out 2014-05-05 16:29:25.000000000 +0200 @@ -4,10 +4,10 @@ parse2 data[md125] -> md_type:raid1 super:external:/md127/0 size_k:4194304 readonly devices:</dev/sdb /dev/sda> has_container container_name:md127 container_member:0 data[md126] -> md_type:raid0 super:external:/md127/1 chunk_k:128 size_k:8378790 devices:</dev/sdb /dev/sda> has_container container_name:md127 container_member:1 -data[md127] -> md_type:unknown super:external:imsm size_k:5104 readonly inactive devices:<> spares:</dev/sda /dev/sdb> +data[md127] -> md_type:unknown super:external:imsm size_k:5104 readonly inactive devices:<> spares:</dev/sda /dev/sdb> is_container parse3 data[md125] -> md_type:raid1 super:external:/md127/1 size_k:7355904 devices:</dev/sdb /dev/sda> has_container container_name:md127 container_member:1 data[md126] -> md_type:raid0 super:external:/md127/0 chunk_k:512 size_k:1999872 devices:</dev/sdb /dev/sda> has_container container_name:md127 container_member:0 -data[md127] -> md_type:unknown super:external:ddf size_k:65536 readonly inactive devices:<> spares:</dev/sda /dev/sdb> +data[md127] -> md_type:unknown super:external:ddf size_k:65536 readonly inactive devices:<> spares:</dev/sda /dev/sdb> is_container -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit systemd for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2014-05-06 13:39:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2014-05-02 20:51:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2014-05-06 13:39:47.000000000 +0200 @@ -1,0 +2,11 @@ +Mon May 5 14:02:16 UTC 2014 - werner(a)suse.de + +- Port upstream patch + 0001-sd-rtnl-message-append-fix-uninitialized-memory.patch + back to 210 +- Add patch keep-crypt-password-prompt.patch from Thomas Blume + to fix bnc#875502 - fails to boot when swap space is encrypted +- Port upstream patch set for net_id back in patch + upstream-net_id-changes.patch + +------------------------------------------------------------------- systemd.changes: same change New: ---- 0001-sd-rtnl-message-append-fix-uninitialized-memory.patch keep-crypt-password-prompt.patch upstream-net_id-changes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.HU7dku/_old 2014-05-06 13:39:50.000000000 +0200 +++ /var/tmp/diff_new_pack.HU7dku/_new 2014-05-06 13:39:50.000000000 +0200 @@ -399,6 +399,10 @@ Patch203: respect-nfs-bg-option.patch # PATCH-FIX-UPSTREAM Stop useless messages on dual_timestamp_is_set is failed. Patch204: shut-up-annoying-assertion-monotonic-clock-message.patch +# PATCH-FIX-SUSE Do not override the passphrase prompts due messages of busy jobs +Patch205: keep-crypt-password-prompt.patch +# PATCH-FIX-UPSTREAM Fix uninitialized memory +Patch206: 0001-sd-rtnl-message-append-fix-uninitialized-memory.patch # UDEV PATCHES # ============ @@ -432,6 +436,8 @@ Patch1012: 1012-Skip-persistent-device-link-creation-on-multipath-de.patch # PATCH-FIX-SUSE Do not use runtime PM for some IBM consoles (bnc#868931) Patch1013: 1013-no-runtime-PM-for-IBM-consoles.patch +# PATCH-FIX-UPSTREAM Move forward to git Head for net_id +Patch1014: upstream-net_id-changes.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -784,6 +790,8 @@ %patch202 -p0 %patch203 -p1 %patch204 -p1 +%patch205 -p1 +%patch206 -p0 # udev patches %patch1001 -p1 @@ -800,6 +808,9 @@ %patch1011 -p1 %patch1012 -p1 %patch1013 -p1 +%if 0%{?suse_version} > 1310 +%patch1014 -p0 +%endif # ensure generate files are removed rm -f units/emergency.service systemd.spec: same change ++++++ 0001-sd-rtnl-message-append-fix-uninitialized-memory.patch ++++++ Backport of 7ca1d31964a2553f7bd011bc10ac42e0ebc1f975 Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg(a)jklm.no> Date: Fri, 2 May 2014 22:29:18 +0200 Subject: [PATCH] sd-rtnl-message: append - fix uninitialized memory We were not properly clearing the padding at the front of some containers. --- src/libsystemd/sd-rtnl/rtnl-message.c | 42 +++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 15 deletions(-) --- src/libsystemd/sd-rtnl/rtnl-message.c +++ src/libsystemd/sd-rtnl/rtnl-message.c 2014-05-05 13:33:01.998235340 +0000 @@ -314,24 +314,28 @@ int sd_rtnl_message_link_get_flags(sd_rt /* If successful the updated message will be correctly aligned, if unsuccessful the old message is untouched. */ static int add_rtattr(sd_rtnl_message *m, unsigned short type, const void *data, size_t data_length) { - uint32_t rta_length, message_length; + uint32_t rta_length; + size_t message_length, padding_length; struct nlmsghdr *new_hdr; struct rtattr *rta; char *padding; unsigned i; + int offset; assert(m); assert(m->hdr); assert(!m->sealed); assert(NLMSG_ALIGN(m->hdr->nlmsg_len) == m->hdr->nlmsg_len); - assert(!data || data_length > 0); - assert(data || m->n_containers < RTNL_CONTAINER_DEPTH); + assert(!data || data_length); + + /* get offset of the new attribute */ + offset = m->hdr->nlmsg_len; /* get the size of the new rta attribute (with padding at the end) */ rta_length = RTA_LENGTH(data_length); /* get the new message size (with padding at the end) */ - message_length = m->hdr->nlmsg_len + RTA_ALIGN(rta_length); + message_length = offset + RTA_ALIGN(rta_length); /* realloc to fit the new attribute */ new_hdr = realloc(m->hdr, message_length); @@ -340,32 +344,35 @@ static int add_rtattr(sd_rtnl_message *m m->hdr = new_hdr; /* get pointer to the attribute we are about to add */ - rta = (struct rtattr *) ((uint8_t *) m->hdr + m->hdr->nlmsg_len); + rta = (struct rtattr *) ((uint8_t *) m->hdr + offset); /* if we are inside containers, extend them */ for (i = 0; i < m->n_containers; i++) - GET_CONTAINER(m, i)->rta_len += message_length - m->hdr->nlmsg_len; + GET_CONTAINER(m, i)->rta_len += message_length - offset; /* fill in the attribute */ rta->rta_type = type; rta->rta_len = rta_length; - if (!data) { - /* this is the start of a new container */ - m->container_offsets[m->n_containers ++] = m->hdr->nlmsg_len; - } else { + if (data) /* we don't deal with the case where the user lies about the type * and gives us too little data (so don't do that) - */ + */ padding = mempcpy(RTA_DATA(rta), data, data_length); - /* make sure also the padding at the end of the message is initialized */ - memzero(padding, - (uint8_t *) m->hdr + message_length - (uint8_t *) padding); + else { + /* if no data was passed, make sure we still initialize the padding + note that we can have data_length > 0 (used by some containers) */ + padding = RTA_DATA(rta); + data_length = 0; } + /* make sure also the padding at the end of the message is initialized */ + padding_length = (uint8_t*)m->hdr + message_length - (uint8_t*)padding; + memzero(padding, padding_length); + /* update message size */ m->hdr->nlmsg_len = message_length; - return 0; + return offset; } int sd_rtnl_message_append_string(sd_rtnl_message *m, unsigned short type, const char *data) { @@ -498,6 +505,7 @@ int sd_rtnl_message_append_u32(sd_rtnl_m assert_return(m, -EINVAL); assert_return(!m->sealed, -EPERM); + assert_return(m->n_containers < RTNL_CONTAINER_DEPTH, -ERANGE); r = sd_rtnl_message_get_type(m, &rtm_type); if (r < 0) @@ -548,6 +556,10 @@ int sd_rtnl_message_append_u32(sd_rtnl_m if (r < 0) return r; + m->container_offsets[m->n_containers ++] = r; + + m->container_offsets[m->n_containers ++] = r; + return 0; } ++++++ keep-crypt-password-prompt.patch ++++++ --- systemd-210/src/core/manager.c 2014-05-05 11:46:17.700483956 +0200 +++ systemd-210/src/core/manager.c 2014-05-05 13:29:13.296503646 +0200 @@ -152,6 +152,29 @@ } } +static int check_for_password_prompt(void) { + DIR *d; + struct dirent *de; + + if (!(d = opendir("/run/systemd/ask-password"))) { + log_error("opendir(): %m"); + + if (errno == ENOENT) + return 1; + + return -errno; + } + + while ((de = readdir(d))) { + if (startswith(de->d_name, "ask.")) { + closedir(d); + return 0; + } + } + closedir(d); + return 1; +} + static void manager_print_jobs_in_progress(Manager *m) { static int is_ansi_console = -1; _cleanup_free_ char *job_of_n = NULL; @@ -195,6 +217,10 @@ m->jobs_in_progress_iteration++; + //don't overwrite the crypt password prompt with job status messages + if (check_for_password_prompt() == 0); + return 0; + if (m->n_running_jobs > 1) if (asprintf(&job_of_n, "(%u of %u) ", counter, m->n_running_jobs) < 0) job_of_n = NULL; ++++++ upstream-net_id-changes.patch ++++++ This the diff between systemd-210 and 19aa72f74e41045510b4af3f1415b419d42ff20b But we do not remove the ATA support as in HEAD --- src/udev/udev-builtin-net_id.c | 54 ++++++---------------------------------- src/udev/udev-builtin-path_id.c | 3 -- 2 files changed, 9 insertions(+), 48 deletions(-) --- src/udev/udev-builtin-net_id.c +++ src/udev/udev-builtin-net_id.c 2014-04-08 07:16:45.094235605 +0000 @@ -33,6 +33,8 @@ * ww -- wwan * * Type of names: + * b<number> -- BCMA bus core number + * ccw<name> -- CCW bus group name * o<index> -- on-board device index number * s<slot>[f<function>][d<dev_id>] -- hotplug slot index number * x<MAC> -- MAC address @@ -92,6 +94,7 @@ #include <string.h> #include <errno.h> #include <net/if.h> +#include <net/if_arp.h> #include <linux/pci_regs.h> #include "udev.h" @@ -119,12 +122,8 @@ struct netnames { const char *pci_onboard_label; char usb_ports[IFNAMSIZ]; - char bcma_core[IFNAMSIZ]; - - char virtio_core[IFNAMSIZ]; - - char ccw_core[IFNAMSIZ]; + char ccw_group[IFNAMSIZ]; }; /* retrieve on-board index number and label from firmware */ @@ -351,25 +350,6 @@ static int names_bcma(struct udev_device return 0; } -static int names_virtio(struct udev_device *dev, struct netnames *names) { - struct udev_device *virtdev; - unsigned int core; - - virtdev = udev_device_get_parent_with_subsystem_devtype(dev, "virtio", NULL); - if (!virtdev) - return -ENOENT; - - /* core num */ - if (sscanf(udev_device_get_sysname(virtdev), "virtio%u", &core) != 1) - return -EINVAL; - /* suppress the common core == 0 */ - if (core > 0) - snprintf(names->virtio_core, sizeof(names->virtio_core), "v%u", core); - - names->type = NET_VIRTIO; - return 0; -} - static int names_ccw(struct udev_device *dev, struct netnames *names) { struct udev_device *cdev; const char *bus_id; @@ -402,8 +382,8 @@ static int names_ccw(struct udev_device return -EINVAL; /* Store the CCW bus-ID for use as network device name */ - rc = snprintf(names->ccw_core, sizeof(names->ccw_core), "ccw%s", bus_id); - if (rc >= 0 && rc < (int)sizeof(names->ccw_core)) + rc = snprintf(names->ccw_group, sizeof(names->ccw_group), "ccw%s", bus_id); + if (rc >= 0 && rc < (int)sizeof(names->ccw_group)) names->type = NET_CCWGROUP; return 0; } @@ -472,10 +452,10 @@ static int builtin_net_id(struct udev_de return EXIT_FAILURE; i = strtoul(s, NULL, 0); switch (i) { - case 1: /* ARPHRD_ETHER */ + case ARPHRD_ETHER: prefix = "en"; break; - case 256: /* ARPHRD_SLIP */ + case ARPHRD_SLIP: prefix = "sl"; break; default: @@ -517,7 +497,7 @@ static int builtin_net_id(struct udev_de if (err >= 0 && names.type == NET_CCWGROUP) { char str[IFNAMSIZ]; - if (snprintf(str, sizeof(str), "%s%s", prefix, names.ccw_core) < (int)sizeof(str)) + if (snprintf(str, sizeof(str), "%s%s", prefix, names.ccw_group) < (int)sizeof(str)) udev_builtin_add_property(dev, test, "ID_NET_NAME_PATH", str); goto out; } @@ -578,22 +558,6 @@ static int builtin_net_id(struct udev_de udev_builtin_add_property(dev, test, "ID_NET_NAME_SLOT", str); goto out; } - - /* virtio bus */ - err = names_virtio(dev, &names); - if (err >= 0 && names.type == NET_VIRTIO) { - char str[IFNAMSIZ]; - - if (names.pci_path[0]) - if (snprintf(str, sizeof(str), "%s%s%s", prefix, names.pci_path, names.virtio_core) < (int)sizeof(str)) - udev_builtin_add_property(dev, test, "ID_NET_NAME_PATH", str); - - if (names.pci_slot[0]) - if (snprintf(str, sizeof(str), "%s%s%s", prefix, names.pci_slot, names.virtio_core) < (int)sizeof(str)) - udev_builtin_add_property(dev, test, "ID_NET_NAME_SLOT", str); - goto out; - } - out: return EXIT_SUCCESS; } --- src/udev/udev-builtin-path_id.c +++ src/udev/udev-builtin-path_id.c 2014-03-28 09:27:20.402735390 +0000 @@ -571,9 +571,6 @@ static int builtin_path_id(struct udev_d } else if (streq(subsys, "xen")) { path_prepend(&path, "xen-%s", udev_device_get_sysname(parent)); parent = skip_subsystem(parent, "xen"); - } else if (streq(subsys, "virtio")) { - path_prepend(&path, "virtio-pci-%s", udev_device_get_sysname(parent)); - parent = skip_subsystem(parent, "virtio"); } else if (streq(subsys, "scm")) { path_prepend(&path, "scm-%s", udev_device_get_sysname(parent)); parent = skip_subsystem(parent, "scm"); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cmake for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2014-05-06 13:39:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cmake" Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake-gui.changes 2014-04-26 17:02:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2014-05-06 13:39:45.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 4 20:52:05 UTC 2014 - arichardson.kde(a)gmail.com + +- Use Qt5 for building the GUI + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-gui.spec ++++++ --- /var/tmp/diff_new_pack.EWoimC/_old 2014-05-06 13:39:46.000000000 +0200 +++ /var/tmp/diff_new_pack.EWoimC/_new 2014-05-06 13:39:46.000000000 +0200 @@ -37,7 +37,11 @@ %endif BuildRequires: curl-devel BuildRequires: gcc-c++ +%if 0%{?suse_version} >= 1320 +BuildRequires: pkgconfig(Qt5Widgets) +%else BuildRequires: libqt4-devel +%endif BuildRequires: openssl-devel BuildRequires: update-desktop-files BuildRequires: zlib-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0