Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2014-08-25 11:02:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2014-08-20 17:54:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2014-08-25 11:03:04.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Aug 21 13:29:52 CEST 2014 - loci...@suse.com + +- Fixed checking whether SuSEfirewall2 package is selected or + installed - in inst_finish, the package is already installed + (bnc#892935) +- 3.1.101 + +------------------------------------------------------------------- Old: ---- yast2-3.1.100.tar.bz2 New: ---- yast2-3.1.101.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.XYoj1V/_old 2014-08-25 11:03:05.000000000 +0200 +++ /var/tmp/diff_new_pack.XYoj1V/_new 2014-08-25 11:03:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.100 +Version: 3.1.101 Release: 0 Url: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.100.tar.bz2 -> yast2-3.1.101.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.100/library/network/src/modules/SuSEFirewall.rb new/yast2-3.1.101/library/network/src/modules/SuSEFirewall.rb --- old/yast2-3.1.100/library/network/src/modules/SuSEFirewall.rb 2014-08-20 10:42:21.000000000 +0200 +++ new/yast2-3.1.101/library/network/src/modules/SuSEFirewall.rb 2014-08-21 13:42:19.000000000 +0200 @@ -1109,9 +1109,10 @@ def SuSEFirewallIsInstalled # Always recheck the status in inst-sys, user/solver might have change # the list of packages selected for installation + # bnc#892935: in inst_finish, the package is already installed if Stage.initial - @needed_packages_installed = Pkg.IsSelected(@FIREWALL_PACKAGE) - log.info "Selected for installation -> #{@needed_packages_installed}" + @needed_packages_installed = Pkg.IsSelected(@FIREWALL_PACKAGE) || PackageSystem.Installed(@FIREWALL_PACKAGE) + log.info "Selected for installation/installed -> #{@needed_packages_installed}" elsif @needed_packages_installed.nil? if Mode.normal @needed_packages_installed = PackageSystem.CheckAndInstallPackages([@FIREWALL_PACKAGE]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.100/library/network/test/susefirewall_test.rb new/yast2-3.1.101/library/network/test/susefirewall_test.rb --- old/yast2-3.1.100/library/network/test/susefirewall_test.rb 2014-08-20 10:42:21.000000000 +0200 +++ new/yast2-3.1.101/library/network/test/susefirewall_test.rb 2014-08-21 13:42:19.000000000 +0200 @@ -25,14 +25,19 @@ end context "while in inst-sys" do - it "returns whether SuSEfirewall2 is selected for installation" do + it "returns whether SuSEfirewall2 is selected for installation or already installed" do expect(Yast::Stage).to receive(:stage).and_return("initial").at_least(:once) # Value is not cached - expect(Yast::Pkg).to receive(:IsSelected).and_return(true, false, true).exactly(3).times + expect(Yast::Pkg).to receive(:IsSelected).and_return(true, false, false).exactly(3).times + # Fallback: if not selected, checks whether the package is installed + expect(Yast::PackageSystem).to receive(:Installed).and_return(false, true).twice + # Selected expect(Yast::SuSEFirewall.SuSEFirewallIsInstalled).to be_true + # Not selected and not installed expect(Yast::SuSEFirewall.SuSEFirewallIsInstalled).to be_false + # Not selected, but installed expect(Yast::SuSEFirewall.SuSEFirewallIsInstalled).to be_true end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.100/package/yast2.changes new/yast2-3.1.101/package/yast2.changes --- old/yast2-3.1.100/package/yast2.changes 2014-08-20 10:42:21.000000000 +0200 +++ new/yast2-3.1.101/package/yast2.changes 2014-08-21 13:42:19.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Aug 21 13:29:52 CEST 2014 - loci...@suse.com + +- Fixed checking whether SuSEfirewall2 package is selected or + installed - in inst_finish, the package is already installed + (bnc#892935) +- 3.1.101 + +------------------------------------------------------------------- Wed Aug 20 10:11:10 CEST 2014 - loci...@suse.com - Fixed RPM description (bnc#888994) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.100/package/yast2.spec new/yast2-3.1.101/package/yast2.spec --- old/yast2-3.1.100/package/yast2.spec 2014-08-20 10:42:21.000000000 +0200 +++ new/yast2-3.1.101/package/yast2.spec 2014-08-21 13:42:19.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.100 +Version: 3.1.101 Release: 0 URL: https://github.com/yast/yast-yast2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
