Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2015-05-07 09:21:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-06 07:48:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2015-05-07 09:21:31.000000000 +0200 @@ -1,0 +2,14 @@ +Wed May 6 11:48:40 CEST 2015 - [email protected] + +- Added 'bootloader' and 'report' into list of supported profile + sections (bsc#925381) +- 3.1.78 + +------------------------------------------------------------------- +Wed May 6 10:46:37 CEST 2015 - [email protected] + +- Added libxslt into BuildRequires - needed for running test-cases + (bsc#929832) +- 3.1.77 + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.76.tar.bz2 New: ---- autoyast2-3.1.78.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.6VOvEj/_old 2015-05-07 09:21:32.000000000 +0200 +++ /var/tmp/diff_new_pack.6VOvEj/_new 2015-05-07 09:21:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.76 +Version: 3.1.78 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -30,6 +30,8 @@ BuildRequires: yast2-installation-control # xmllint BuildRequires: libxml2-tools +# xsltproc for AutoinstClass +BuildRequires: libxslt BuildRequires: yast2 BuildRequires: yast2-packager BuildRequires: yast2-services-manager ++++++ autoyast2-3.1.76.tar.bz2 -> autoyast2-3.1.78.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.76/package/autoyast2.changes new/autoyast2-3.1.78/package/autoyast2.changes --- old/autoyast2-3.1.76/package/autoyast2.changes 2015-05-05 16:39:08.000000000 +0200 +++ new/autoyast2-3.1.78/package/autoyast2.changes 2015-05-06 13:04:07.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Wed May 6 11:48:40 CEST 2015 - [email protected] + +- Added 'bootloader' and 'report' into list of supported profile + sections (bsc#925381) +- 3.1.78 + +------------------------------------------------------------------- +Wed May 6 10:46:37 CEST 2015 - [email protected] + +- Added libxslt into BuildRequires - needed for running test-cases + (bsc#929832) +- 3.1.77 + +------------------------------------------------------------------- Tue May 5 15:05:18 CEST 2015 - [email protected] - Reporting unknown and unsupported profile sections (bnc#925381) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.76/package/autoyast2.spec new/autoyast2-3.1.78/package/autoyast2.spec --- old/autoyast2-3.1.76/package/autoyast2.spec 2015-05-05 16:39:08.000000000 +0200 +++ new/autoyast2-3.1.78/package/autoyast2.spec 2015-05-06 13:04:07.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.76 +Version: 3.1.78 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -30,6 +30,8 @@ BuildRequires: yast2-installation-control # xmllint BuildRequires: libxml2-tools +# xsltproc for AutoinstClass +BuildRequires: libxslt BuildRequires: rubygem(rspec) BuildRequires: yast2 BuildRequires: yast2-storage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.76/src/modules/Profile.rb new/autoyast2-3.1.78/src/modules/Profile.rb --- old/autoyast2-3.1.76/src/modules/Profile.rb 2015-05-05 16:39:08.000000000 +0200 +++ new/autoyast2-3.1.78/src/modules/Profile.rb 2015-05-06 13:04:07.000000000 +0200 @@ -13,6 +13,8 @@ # All these sections are handled by AutoYaST (or Installer) itself, # it doesn't use any external AutoYaST client for them GENERIC_PROFILE_SECTIONS = [ + # Booting is configured during the installation + "bootloader", # Bug: this is already in every auto-generated profile "deploy_image", # AutoYaST configuration - complete configuration files @@ -23,6 +25,8 @@ "partitioning", # AutoYaST has its Preboot Execution Environment configuration "pxe", + # Generic AutoYast settings + "report", # AutoYaST configuration - pre and post-install scripts "scripts", # AutoYaST has also its own software selection diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.76/test/AutoinstClass_test.rb new/autoyast2-3.1.78/test/AutoinstClass_test.rb --- old/autoyast2-3.1.76/test/AutoinstClass_test.rb 2015-05-05 16:39:08.000000000 +0200 +++ new/autoyast2-3.1.78/test/AutoinstClass_test.rb 2015-05-06 13:04:07.000000000 +0200 @@ -7,14 +7,15 @@ describe Yast::AutoinstClass do subject { Yast::AutoinstClass } - let(:root_path) { File.expand_path('../..', __FILE__) } - let(:test_xml_dir) { File.join(root_path, 'test', 'fixtures') } - let(:class_dir) { File.join(test_xml_dir, 'classes') } - let(:class_path) { File.join(class_dir, 'classes.xml') } + ROOT_PATH = File.expand_path('../..', __FILE__) + FIXTURES_PATH = File.join(ROOT_PATH, 'test', 'fixtures') + CLASS_DIR = File.join(FIXTURES_PATH, 'classes') + CLASS_PATH = File.join(CLASS_DIR, 'classes.xml') + let(:settings) { [ { 'class_name' => 'swap', 'configuration' => 'largeswap.xml' } ] } before(:each) do - subject.class_dir = class_dir + subject.class_dir = CLASS_DIR end describe '#Read' do @@ -31,7 +32,7 @@ context 'when classes definition file does not exist' do before(:each) do - allow(Yast::SCR).to receive(:Read).with(Yast::Path.new('.target.size'), class_path).and_return(-1) + allow(Yast::SCR).to receive(:Read).with(Yast::Path.new('.target.size'), CLASS_PATH).and_return(-1) end it 'sets Classes to []' do @@ -47,7 +48,7 @@ context 'when classes definition is empty or not valid XML' do before(:each) do allow(Yast::SCR).to receive(:Read).and_call_original - allow(Yast::SCR).to receive(:Read).with(Yast::Path.new('.xml'), class_path).and_return(nil) + allow(Yast::SCR).to receive(:Read).with(Yast::Path.new('.xml'), CLASS_PATH).and_return(nil) end it 'set Classes to []' do @@ -77,7 +78,7 @@ end context 'when classes definitions are not found' do - let(:swap_class_dir) { File.join(class_dir, 'swap') } + let(:swap_class_dir) { File.join(CLASS_DIR, 'swap') } before(:each) do allow(Yast::SCR).to receive(:Read). @@ -107,13 +108,13 @@ end describe '#classDirChanged' do - let(:new_class_dir) { File.join(test_xml_dir, 'new_classes') } + let(:new_class_dir) { File.join(FIXTURES_PATH, 'new_classes') } after(:each) do # Restore original configuration after the test - allow(Yast::AutoinstConfig).to receive(:classDir=).with(class_dir).and_call_original + allow(Yast::AutoinstConfig).to receive(:classDir=).with(CLASS_DIR).and_call_original allow(subject).to receive(:Read) - subject.classDirChanged(class_dir) + subject.classDirChanged(CLASS_DIR) end it 'reads again the classes definitions' do @@ -133,7 +134,7 @@ context 'when class and configuration exists' do it 'returns string with path to classes directory, class name and configuration' do - expect(subject.findPath(name, _class)).to eq(File.join(class_dir, _class, name)) + expect(subject.findPath(name, _class)).to eq(File.join(CLASS_DIR, _class, name)) end end @@ -141,7 +142,7 @@ let(:_class) { 'not-existent-class' } it 'returns string with path to a default directory below the classes directory' do - expect(subject.findPath(name, _class)).to eq(File.join(class_dir, 'default')) + expect(subject.findPath(name, _class)).to eq(File.join(CLASS_DIR, 'default')) end end @@ -149,13 +150,13 @@ let(:name) { 'not-existent-name' } it 'returns string with path to a default directory below the classes directory' do - expect(subject.findPath(name, _class)).to eq(File.join(class_dir, 'default')) + expect(subject.findPath(name, _class)).to eq(File.join(CLASS_DIR, 'default')) end end end describe '#Compat' do - let(:faked_autoinstall_dir) { File.join(test_xml_dir, 'etc', 'autoinstall') } + let(:faked_autoinstall_dir) { File.join(FIXTURES_PATH, 'etc', 'autoinstall') } around(:each) do |example| subject.ClassConf = faked_autoinstall_dir @@ -174,7 +175,7 @@ before(:each) do allow(Yast::SCR).to receive(:Read).and_call_original allow(Yast::SCR).to receive(:Read). - with(Yast::Path.new('.target.size'), class_path).and_return(-1) + with(Yast::Path.new('.target.size'), CLASS_PATH).and_return(-1) end context 'and /etc/autoinstall/classes.xml exists' do @@ -182,7 +183,7 @@ expect(Yast::XML).to receive(:YCPToXMLFile) do |type, data, path| expect(type).to eq(:class) expect(data['classes']).to be_kind_of(Array) - expect(path).to eq(File.join(class_dir, 'classes.xml')) + expect(path).to eq(File.join(CLASS_DIR, 'classes.xml')) end subject.Compat end @@ -197,7 +198,7 @@ it 'creates a classes.xmlfile in the new location with no classes' do expect(Yast::XML).to receive(:YCPToXMLFile). - with(:class, {"classes" => []}, File.join(class_dir, 'classes.xml')) + with(:class, {"classes" => []}, File.join(CLASS_DIR, 'classes.xml')) subject.Compat end end @@ -206,25 +207,25 @@ describe '#class_dir=' do it 'sets the classes definitions directory' do - subject.class_dir = test_xml_dir - expect(subject.classDir).to eq(test_xml_dir) + subject.class_dir = FIXTURES_PATH + expect(subject.classDir).to eq(FIXTURES_PATH) end end describe '#MergeClasses' do - let(:base_profile_path) { File.join('test', 'fixtures', 'profiles', 'partitions.xml') } - let(:tmp_dir) { File.join(root_path, 'tmp') } + let(:base_profile_path) { File.join(FIXTURES_PATH, 'profiles', 'partitions.xml') } + let(:tmp_dir) { File.join(ROOT_PATH, 'tmp') } let(:expected_xml) { File.read(expected_xml_path) } let(:output_path) { File.join(tmp_dir, 'output.xml') } let(:output_xml) { File.read(output_path) } let(:dontmerge) { [] } - let(:merge_xslt_path) { File.join('xslt', 'merge.xslt') } + let(:merge_xslt_path) { File.join(ROOT_PATH, 'xslt', 'merge.xslt') } let(:conf_to_merge) { { "class" => "swap", "name" => "largeswap.xml" } } let(:xsltproc_command) { "/usr/bin/xsltproc --novalid --param replace \"'false'\" " \ "--param with \"'#{subject.findPath("largeswap.xml", "swap")}'\" "\ "--output #{File.join(tmp_dir, "output.xml")} " \ - "#{merge_xslt_path} test/fixtures/profiles/partitions.xml " + "#{merge_xslt_path} #{base_profile_path} " } before(:each) do @@ -252,7 +253,7 @@ end context 'when all elements must be merged' do - let(:expected_xml_path) { File.join(root_path, 'test', 'fixtures', 'output', 'partitions-merged.xml') } + let(:expected_xml_path) { File.join(ROOT_PATH, 'test', 'fixtures', 'output', 'partitions-merged.xml') } it 'merges elements from profile and configuration' do expect(Yast::SCR).to receive(:Execute). @@ -263,14 +264,14 @@ end context 'when some elements are not intended to be merged' do - let(:expected_xml_path) { File.join(root_path, 'test', 'fixtures', 'output', 'partitions-dontmerge.xml') } + let(:expected_xml_path) { File.join(ROOT_PATH, 'test', 'fixtures', 'output', 'partitions-dontmerge.xml') } let(:dontmerge) { ['partition'] } let(:xsltproc_command) { "/usr/bin/xsltproc --novalid --param replace \"'false'\" " \ "--param dontmerge1 \"'partition'\" " \ "--param with \"'#{subject.findPath("largeswap.xml", "swap")}'\" "\ "--output #{File.join(tmp_dir, "output.xml")} " \ - "#{merge_xslt_path} test/fixtures/profiles/partitions.xml " + "#{merge_xslt_path} #{base_profile_path} " } it 'does not merge those elements' do @@ -361,7 +362,7 @@ expect(Yast::XML).to receive(:YCPToXMLFile) do |type, data, path| expect(type).to eq(:class) expect(data['classes']).to be_kind_of(Array) - expect(path).to eq(File.join(class_dir, 'classes.xml')) + expect(path).to eq(File.join(CLASS_DIR, 'classes.xml')) end subject.Save end @@ -377,7 +378,7 @@ allow(Yast::XML).to receive(:YCPToXMLFile).with(any_args) expect(Yast::SCR).to receive(:Execute).with( Yast::Path.new('.target.bash'), - "/bin/rm -rf #{class_dir}/swap") + "/bin/rm -rf #{CLASS_DIR}/swap") subject.Save end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.76/test/Makefile.am new/autoyast2-3.1.78/test/Makefile.am --- old/autoyast2-3.1.76/test/Makefile.am 2015-05-05 16:39:08.000000000 +0200 +++ new/autoyast2-3.1.78/test/Makefile.am 2015-05-06 13:04:07.000000000 +0200 @@ -4,6 +4,7 @@ TESTS = \ AutoInstallRules_test.rb \ + AutoinstClass_test.rb \ Y2ModuleConfig_test.rb TEST_EXTENSIONS = .rb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.76/test/fixtures/profiles/unhandled_and_obsolete.xml new/autoyast2-3.1.78/test/fixtures/profiles/unhandled_and_obsolete.xml --- old/autoyast2-3.1.76/test/fixtures/profiles/unhandled_and_obsolete.xml 2015-05-05 16:39:08.000000000 +0200 +++ new/autoyast2-3.1.78/test/fixtures/profiles/unhandled_and_obsolete.xml 2015-05-06 13:04:07.000000000 +0200 @@ -35,6 +35,8 @@ <pxe><x config:type="boolean">false</x></pxe> <language><x config:type="boolean">false</x></language> <ca_mgm><x config:type="boolean">false</x></ca_mgm> + <bootloader/> + <report/> <groups/> <deploy_image> <image_installation config:type="boolean">false</image_installation>
