Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2015-08-05 19:13:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-07-19 11:44:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2015-08-05 19:13:56.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Jul 31 13:55:34 CEST 2015 - [email protected] + +- <software><post-packages>: Must not reinstall already installed + packages. (fate#319086) +- 3.1.87 + +------------------------------------------------------------------- +Thu Jul 16 17:47:27 UTC 2015 - [email protected] + +- Fixed a syntax error in the schema definition (bsc#938459) +- 3.1.86 + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.85.tar.bz2 New: ---- autoyast2-3.1.87.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.HNfw1F/_old 2015-08-05 19:13:57.000000000 +0200 +++ /var/tmp/diff_new_pack.HNfw1F/_new 2015-08-05 19:13:57.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.85 +Version: 3.1.87 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-3.1.85.tar.bz2 -> autoyast2-3.1.87.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.85/.travis.yml new/autoyast2-3.1.87/.travis.yml --- old/autoyast2-3.1.85/.travis.yml 2015-07-10 15:24:44.000000000 +0200 +++ new/autoyast2-3.1.87/.travis.yml 2015-07-31 14:34:09.000000000 +0200 @@ -5,7 +5,7 @@ # disable rvm, use system Ruby - rvm reset - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh - - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-storage yast2-xml yast2-transfer yast2-services-manager yast2-installation-control yast2-packager" -g "rspec:2.14.1 yast-rake gettext" + - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-storage yast2-xml yast2-transfer yast2-services-manager yast2-installation-control yast2-packager trang" -g "rspec:3.3.0 yast-rake gettext" script: - rake check:syntax - rake check:pot @@ -13,4 +13,5 @@ - make - sudo make install - make check + - ./check_schema.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.85/check_schema.sh new/autoyast2-3.1.87/check_schema.sh --- old/autoyast2-3.1.85/check_schema.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/autoyast2-3.1.87/check_schema.sh 2015-07-31 14:34:09.000000000 +0200 @@ -0,0 +1,18 @@ +#! /bin/sh + +# explicitly check the RNC schema files for errors +# (the files are defined here, but converted in yast2-schema) +find . -name "*.rnc" -exec trang -I rnc -O rng \{\} test.rng \; 2> trang.log +rm -f test.rng + +# grep for "error" in the output, "trang" returns 0 exit status +# even on an error :-( +if grep -i -q error trang.log; then + echo "Error in schema:" + cat trang.log + rm -f trang.log + exit 1 +fi + +rm -f trang.log + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.85/package/autoyast2.changes new/autoyast2-3.1.87/package/autoyast2.changes --- old/autoyast2-3.1.85/package/autoyast2.changes 2015-07-10 15:24:44.000000000 +0200 +++ new/autoyast2-3.1.87/package/autoyast2.changes 2015-07-31 14:34:09.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Jul 31 13:55:34 CEST 2015 - [email protected] + +- <software><post-packages>: Must not reinstall already installed + packages. (fate#319086) +- 3.1.87 + +------------------------------------------------------------------- +Thu Jul 16 17:47:27 UTC 2015 - [email protected] + +- Fixed a syntax error in the schema definition (bsc#938459) +- 3.1.86 + +------------------------------------------------------------------- Fri Jul 10 14:51:44 CEST 2015 - [email protected] - Syncing hardware time before starting installation via ntp. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.85/package/autoyast2.spec new/autoyast2-3.1.87/package/autoyast2.spec --- old/autoyast2-3.1.85/package/autoyast2.spec 2015-07-10 15:24:44.000000000 +0200 +++ new/autoyast2-3.1.87/package/autoyast2.spec 2015-07-31 14:34:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.85 +Version: 3.1.87 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.85/src/autoyast-rnc/general.rnc new/autoyast2-3.1.87/src/autoyast-rnc/general.rnc --- old/autoyast2-3.1.85/src/autoyast-rnc/general.rnc 2015-07-10 15:24:44.000000000 +0200 +++ new/autoyast2-3.1.87/src/autoyast-rnc/general.rnc 2015-07-31 14:34:09.000000000 +0200 @@ -112,7 +112,7 @@ forceboot = element forceboot { BOOLEAN } ntp_sync_time_before_installation = - ntp_sync_time_before_installation {text} + element ntp_sync_time_before_installation {text} halt = element halt { BOOLEAN } second_stage = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.85/src/modules/AutoinstSoftware.rb new/autoyast2-3.1.87/src/modules/AutoinstSoftware.rb --- old/autoyast2-3.1.85/src/modules/AutoinstSoftware.rb 2015-07-10 15:24:44.000000000 +0200 +++ new/autoyast2-3.1.87/src/modules/AutoinstSoftware.rb 2015-07-31 14:34:09.000000000 +0200 @@ -32,6 +32,7 @@ Yast.import "Misc" Yast.import "Directory" Yast.import "Y2ModuleConfig" + Yast.import "PackageSystem" Yast.include self, "autoinstall/io.rb" @@ -178,7 +179,8 @@ PackageAI.toinstall = settings.fetch("packages",[]) @kernel = settings.fetch("kernel","") - AutoinstData.post_packages = settings.fetch("post-packages", []) + + addPostPackages(settings.fetch("post-packages", [])) AutoinstData.post_patterns = settings.fetch("post-patterns", []) PackageAI.toremove = settings.fetch("remove-packages", []) @@ -943,6 +945,9 @@ # @param list calculated post packages # @return [void] def addPostPackages(calcpost) + # filter out already installed packages + calcpost.reject!{|p| PackageSystem.Installed(p)} + calcpost = deep_copy(calcpost) AutoinstData.post_packages = Convert.convert( Builtins.toset(Builtins.union(calcpost, AutoinstData.post_packages)), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.85/test/AutoinstSoftware_test.rb new/autoyast2-3.1.87/test/AutoinstSoftware_test.rb --- old/autoyast2-3.1.85/test/AutoinstSoftware_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/autoyast2-3.1.87/test/AutoinstSoftware_test.rb 2015-07-31 14:34:09.000000000 +0200 @@ -0,0 +1,31 @@ +#!/usr/bin/env rspec + +require_relative "test_helper" + +Yast.import "AutoinstSoftware" +Yast.import "Profile" + +describe Yast::AutoinstSoftware do + subject { Yast::AutoinstSoftware } + FIXTURES_PATH = File.join(File.dirname(__FILE__), 'fixtures') + let(:profile) { File.join(FIXTURES_PATH, 'profiles', 'software.xml') } + + before(:each) do + Yast::Profile.ReadXML(profile) + end + + describe "post-software installation" do + + it "installs packages only if they have not already been installed" do + Yast::AutoinstData.post_packages = ["a2"] + expect(Yast::PackageSystem).to receive(:Installed).with("a1").and_return(false) + expect(Yast::PackageSystem).to receive(:Installed).with("a2").and_return(false) + expect(Yast::PackageSystem).to receive(:Installed).with("a3").and_return(true) + subject.Import(Yast::Profile.current["software"]) + + expect(Yast::AutoinstData.send(:post_packages)).to eq(["a1","a2"]) + end + + end + +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.85/test/fixtures/profiles/software.xml new/autoyast2-3.1.87/test/fixtures/profiles/software.xml --- old/autoyast2-3.1.85/test/fixtures/profiles/software.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/autoyast2-3.1.87/test/fixtures/profiles/software.xml 2015-07-31 14:34:09.000000000 +0200 @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns"; xmlns:config="http://www.suse.com/1.0/configns";> + <software> + <image/> + <instsource/> + <post-packages config:type="list"> + <post-package>a1</post-package> + <post-package>a2</post-package> + <post-package>a3</post-package> + </post-packages> + </software> +</profile>
