Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-storage -> sle12 ## BNC# 869313 : "Default partition scheme provided by installer fails." (RESOLVED/FIXED) ## BNC# 868864 : "Remove "import mount points" button from the suggested partitioning UI" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-storage/yast2-storage.changes 2014-03-19 12:01:35.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-storage/yast2-storage.changes 2014-03-28 13:54:35.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Mar 26 16:51:06 CET 2014 - aschnell@suse.de + +- fixed proposal on PPC (bnc#869313) +- version 3.1.15 + +------------------------------------------------------------------- +Wed Mar 19 14:18:07 CET 2014 - aschnell@suse.de + +- removed "Import Partition Setup" button (bnc#868864) + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-storage - at least 24 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-storage (Old) and /mounts/work_src_done/SLE12/yast2-storage (BS:build ID:35127 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-storage", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-storage-3.1.14.tar.bz2 New: ---- yast2-storage-3.1.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.DlDf89/_old 2014-03-28 16:31:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DlDf89/_new 2014-03-28 16:31:23.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.14 +Version: 3.1.15 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-storage-3.1.14.tar.bz2 -> yast2-storage-3.1.15.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/package/yast2-storage.changes new/yast2-storage-3.1.15/package/yast2-storage.changes --- old/yast2-storage-3.1.14/package/yast2-storage.changes 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/package/yast2-storage.changes 2014-03-28 13:48:38.000000000 +0100 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Wed Mar 26 16:51:06 CET 2014 - aschnell@suse.de + +- fixed proposal on PPC (bnc#869313) +- version 3.1.15 + +------------------------------------------------------------------- +Wed Mar 19 14:18:07 CET 2014 - aschnell@suse.de + +- removed "Import Partition Setup" button (bnc#868864) + +------------------------------------------------------------------- Tue Mar 18 17:49:14 CET 2014 - aschnell@suse.de - fixed btrfs_increase_percentage handling in storage proposal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/package/yast2-storage.spec new/yast2-storage-3.1.15/package/yast2-storage.spec --- old/yast2-storage-3.1.14/package/yast2-storage.spec 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/package/yast2-storage.spec 2014-03-28 13:48:38.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.14 +Version: 3.1.15 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/src/clients/inst_disk_proposal.rb new/yast2-storage-3.1.15/src/clients/inst_disk_proposal.rb --- old/yast2-storage-3.1.14/src/clients/inst_disk_proposal.rb 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/src/clients/inst_disk_proposal.rb 2014-03-28 13:48:38.000000000 +0100 @@ -56,7 +56,6 @@ Yast.include self, "partitioning/custom_part_dialogs.rb" - Yast.include self, "partitioning/ep-import.rb" @targetMap = Storage.GetTargetMap @@ -79,8 +78,6 @@ @modify_str = _("&Edit Partition Setup...") # Radiobutton for partition dialog @detailed_str = _("&Create Partition Setup...") - # Radiobutton for partition dialog - @import_str = _("&Import Partition Setup...") @target_is = "" @@ -136,8 +133,6 @@ @bframe = VBox( PushButton(Id(:detailed), @detailed_str), VSpacing(0.2), - PushButton(Id(:import), @import_str), - VSpacing(0.2), PushButton(Id(:modify), @modify_str) ) @@ -182,19 +177,6 @@ ) # help text continued - # %1 is replaced by button text - help_text += - Builtins.sformat( - _( - "<p>\n" + - "To import the mount points from an existing Linux\n" + - "system choose <b>%1</b>. You can still make modification\n" + - "afterwards in the expert partitioner dialog.</p>\n" - ), - Builtins.deletechars(@import_str, "&") - ) - - # help text continued help_text += Builtins.sformat( _( @@ -260,7 +242,7 @@ @changes = Storage.ChangeText UI.ChangeWidget(Id(:richtext), :Value, @changes) end - elsif Builtins.contains([:modify, :detailed, :import], @ret) + elsif [:modify, :detailed].include?(@ret) Storage.SetPartProposalFirst(false) Storage.SetPartProposalActive(false) @@ -276,9 +258,6 @@ end Storage.SetPartDisk("") Storage.SetPartProposalMode("detailed") - when :import - @target_is = "PROP_MODIFY" - Storage.SetPartProposalMode("modify") end Storage.SetPartMode(@target_is) @@ -414,8 +393,6 @@ Wizard.OpenNextBackDialog result = Sequencer.Run(aliases, seq) Wizard.CloseDialog - when :import - ImportMountPoints() end Storage.HandleProposalPackages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/src/include/partitioning/custom_part_check_generated.rb new/yast2-storage-3.1.15/src/include/partitioning/custom_part_check_generated.rb --- old/yast2-storage-3.1.14/src/include/partitioning/custom_part_check_generated.rb 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/src/include/partitioning/custom_part_check_generated.rb 2014-03-28 13:48:38.000000000 +0100 @@ -138,8 +138,11 @@ targetMap.each do |dev, disk| parts = disk.fetch("partitions", []) parts.each do |part| - if part.fetch("mount", "") == tmp - root_subvols_shadowed = true + if part.has_key?("mount") + mp = part["mount"] + if (tmp == mp) || (tmp.start_with?(mp) && tmp[mp.size] == "/") + root_subvols_shadowed = true + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/src/modules/Storage.rb new/yast2-storage-3.1.15/src/modules/Storage.rb --- old/yast2-storage-3.1.14/src/modules/Storage.rb 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/src/modules/Storage.rb 2014-03-28 13:48:39.000000000 +0100 @@ -5929,7 +5929,7 @@ Builtins.foreach(target_map) do |k, e| need_lvm = true if Ops.get_symbol(e, "type", :CT_UNKNOWN) == :CT_LVM need_nfs = true if Ops.get_symbol(e, "type", :CT_UNKNOWN) == :CT_NFS - need_iscsi = true if Ops.get_boolean(e, "iscsi", :CT_UNKNOWN) == true + need_iscsi = true if e.fetch("iscsi", false) if Builtins.find(Ops.get_list(e, "partitions", [])) do |part2| FileSystems.HasQuota(part2) end != nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/src/modules/StorageProposal.rb new/yast2-storage-3.1.15/src/modules/StorageProposal.rb --- old/yast2-storage-3.1.14/src/modules/StorageProposal.rb 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/src/modules/StorageProposal.rb 2014-03-28 13:48:39.000000000 +0100 @@ -2055,6 +2055,7 @@ Ops.set(lg, "procpart", 0) lp = Builtins.eval(ps) if Ops.get_boolean(g, "extended_possible", false) && + !Partitions.BootPrimary() && Ops.greater_than( Ops.add(Builtins.size(ps), 1), Builtins.size(Ops.get_list(g, "free_pnr", [])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/empty-big1.out new/yast2-storage-3.1.15/testsuite/tests/empty-big1.out --- old/yast2-storage-3.1.14/testsuite/tests/empty-big1.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/empty-big1.out 2014-03-28 13:48:39.000000000 +0100 @@ -18,6 +18,7 @@ Dump Create subvolume var/tmp on device /dev/sda3 Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:gpt Dump device:/dev/sda1 fsid:0x107 Dump device:/dev/sda2 fsid:0x82 Dump device:/dev/sda3 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/empty-efi1.out new/yast2-storage-3.1.15/testsuite/tests/empty-efi1.out --- old/yast2-storage-3.1.14/testsuite/tests/empty-efi1.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/empty-efi1.out 2014-03-28 13:48:39.000000000 +0100 @@ -19,6 +19,7 @@ Dump Create subvolume var/tmp on device /dev/sda3 Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:gpt Dump device:/dev/sda1 fsid:0x103 Dump device:/dev/sda2 fsid:0x82 Dump device:/dev/sda3 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/empty-efi2.out new/yast2-storage-3.1.15/testsuite/tests/empty-efi2.out --- old/yast2-storage-3.1.14/testsuite/tests/empty-efi2.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/empty-efi2.out 2014-03-28 13:48:39.000000000 +0100 @@ -19,6 +19,7 @@ Dump Create subvolume var/tmp on device /dev/sda3 Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:gpt Dump device:/dev/sda1 fsid:0x103 Dump device:/dev/sda2 fsid:0x82 Dump device:/dev/sda3 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/empty-ppc64le1.out new/yast2-storage-3.1.15/testsuite/tests/empty-ppc64le1.out --- old/yast2-storage-3.1.14/testsuite/tests/empty-ppc64le1.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/empty-ppc64le1.out 2014-03-28 13:48:39.000000000 +0100 @@ -18,6 +18,7 @@ Dump Create subvolume var/tmp on device /dev/sda3 Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos Dump device:/dev/sda1 fsid:0x41 Dump device:/dev/sda2 fsid:0x82 Dump device:/dev/sda3 fsid:0x83 userdata:{"/"=>"snapshots"} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/empty-ppc64le2.out new/yast2-storage-3.1.15/testsuite/tests/empty-ppc64le2.out --- old/yast2-storage-3.1.14/testsuite/tests/empty-ppc64le2.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/empty-ppc64le2.out 2014-03-28 13:48:39.000000000 +0100 @@ -0,0 +1,25 @@ +Dump Proposal: +Dump Create PPC PReP volume /dev/sda1 (203.95 MiB) +Dump Create swap volume /dev/sda2 (2.01 GiB) +Dump Create root volume /dev/sda3 (40.00 GiB) with btrfs +Dump Create volume /dev/sda4 (255.88 GiB) for /home with xfs +Dump Create subvolume boot/grub2/power-ieee1275 on device /dev/sda3 +Dump Create subvolume opt on device /dev/sda3 +Dump Create subvolume srv on device /dev/sda3 +Dump Create subvolume tmp on device /dev/sda3 +Dump Create subvolume usr/local on device /dev/sda3 +Dump Create subvolume var/crash on device /dev/sda3 +Dump Create subvolume var/lib/mailman on device /dev/sda3 +Dump Create subvolume var/lib/named on device /dev/sda3 +Dump Create subvolume var/lib/pgqsl on device /dev/sda3 +Dump Create subvolume var/log on device /dev/sda3 +Dump Create subvolume var/opt on device /dev/sda3 +Dump Create subvolume var/spool on device /dev/sda3 +Dump Create subvolume var/tmp on device /dev/sda3 +Dump +Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos +Dump device:/dev/sda1 fsid:0x41 +Dump device:/dev/sda2 fsid:0x82 +Dump device:/dev/sda3 fsid:0x83 userdata:{"/"=>"snapshots"} +Dump device:/dev/sda4 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/empty-ppc64le2.rb new/yast2-storage-3.1.15/testsuite/tests/empty-ppc64le2.rb --- old/yast2-storage-3.1.14/testsuite/tests/empty-ppc64le2.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/empty-ppc64le2.rb 2014-03-28 13:48:39.000000000 +0100 @@ -0,0 +1,30 @@ +# encoding: utf-8 + +# testedfiles: helper1b.yh +module Yast + class Empty1Client < Client + + def main + Yast.include self, "setup-system.rb" + + setup_system("empty-ppc64le") + + Yast.include self, "helper1a.rb" + + Yast.import "ProductFeatures" + + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) + + Yast.include self, "helper1b.rb" + + nil + end + + end +end + +Yast::Empty1Client.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/empty-s390x1.out new/yast2-storage-3.1.15/testsuite/tests/empty-s390x1.out --- old/yast2-storage-3.1.14/testsuite/tests/empty-s390x1.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/empty-s390x1.out 2014-03-28 13:48:39.000000000 +0100 @@ -18,6 +18,7 @@ Dump Create subvolume var/tmp on device /dev/sda3 Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos Dump device:/dev/sda1 fsid:0x83 Dump device:/dev/sda2 fsid:0x82 Dump device:/dev/sda3 fsid:0x83 userdata:{"/"=>"snapshots"} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/empty-small1.out new/yast2-storage-3.1.15/testsuite/tests/empty-small1.out --- old/yast2-storage-3.1.14/testsuite/tests/empty-small1.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/empty-small1.out 2014-03-28 13:48:39.000000000 +0100 @@ -17,5 +17,6 @@ Dump Create subvolume var/tmp on device /dev/sda2 Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos Dump device:/dev/sda1 fsid:0x82 Dump device:/dev/sda2 fsid:0x83 userdata:{"/"=>"snapshots"} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/empty1.out new/yast2-storage-3.1.15/testsuite/tests/empty1.out --- old/yast2-storage-3.1.14/testsuite/tests/empty1.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/empty1.out 2014-03-28 13:48:39.000000000 +0100 @@ -17,5 +17,6 @@ Dump Create subvolume var/tmp on device /dev/sda2 Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos Dump device:/dev/sda1 fsid:0x82 Dump device:/dev/sda2 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/empty2.out new/yast2-storage-3.1.15/testsuite/tests/empty2.out --- old/yast2-storage-3.1.14/testsuite/tests/empty2.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/empty2.out 2014-03-28 13:48:39.000000000 +0100 @@ -17,6 +17,7 @@ Dump Create subvolume var/tmp on device /dev/sda2 Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos Dump device:/dev/sda1 fsid:0x82 Dump device:/dev/sda2 fsid:0x83 userdata:{"/"=>"snapshots"} Dump device:/dev/sda3 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/empty3.out new/yast2-storage-3.1.15/testsuite/tests/empty3.out --- old/yast2-storage-3.1.14/testsuite/tests/empty3.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/empty3.out 2014-03-28 13:48:39.000000000 +0100 @@ -20,6 +20,7 @@ Dump Create subvolume var/tmp on device /dev/system/root Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos Dump device:/dev/sda1 fsid:0x83 Dump device:/dev/sda2 fsid:0x8e Dump device:/dev/system/root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/empty4.out new/yast2-storage-3.1.15/testsuite/tests/empty4.out --- old/yast2-storage-3.1.14/testsuite/tests/empty4.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/empty4.out 2014-03-28 13:48:39.000000000 +0100 @@ -21,6 +21,7 @@ Dump Create subvolume var/tmp on device /dev/system/root Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos Dump device:/dev/sda1 fsid:0x83 Dump device:/dev/sda2 fsid:0x8e Dump device:/dev/system/root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/empty5.out new/yast2-storage-3.1.15/testsuite/tests/empty5.out --- old/yast2-storage-3.1.14/testsuite/tests/empty5.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/empty5.out 2014-03-28 13:48:39.000000000 +0100 @@ -20,6 +20,7 @@ Dump Create subvolume var/tmp on device /dev/system/root Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos Dump device:/dev/sda1 fsid:0x83 Dump device:/dev/sda2 fsid:0x8e Dump device:/dev/system/root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/empty6.out new/yast2-storage-3.1.15/testsuite/tests/empty6.out --- old/yast2-storage-3.1.14/testsuite/tests/empty6.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/empty6.out 2014-03-28 13:48:39.000000000 +0100 @@ -21,6 +21,7 @@ Dump Create subvolume var/tmp on device /dev/system/root Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos Dump device:/dev/sda1 fsid:0x83 Dump device:/dev/sda2 fsid:0x8e Dump device:/dev/system/root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/empty7.out new/yast2-storage-3.1.15/testsuite/tests/empty7.out --- old/yast2-storage-3.1.14/testsuite/tests/empty7.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/empty7.out 2014-03-28 13:48:39.000000000 +0100 @@ -17,6 +17,7 @@ Dump Create subvolume var/tmp on device /dev/sda2 Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos Dump device:/dev/sda1 fsid:0x82 Dump device:/dev/sda2 fsid:0x83 userdata:{"/"=>"snapshots"} Dump device:/dev/sda3 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/empty8.out new/yast2-storage-3.1.15/testsuite/tests/empty8.out --- old/yast2-storage-3.1.14/testsuite/tests/empty8.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/empty8.out 2014-03-28 13:48:39.000000000 +0100 @@ -17,6 +17,7 @@ Dump Create subvolume var/tmp on device /dev/sda2 Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos Dump device:/dev/sda1 fsid:0x82 Dump device:/dev/sda2 fsid:0x83 userdata:{"/"=>"snapshots"} Dump device:/dev/sda3 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/half-empty1.out new/yast2-storage-3.1.15/testsuite/tests/half-empty1.out --- old/yast2-storage-3.1.14/testsuite/tests/half-empty1.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/half-empty1.out 2014-03-28 13:48:39.000000000 +0100 @@ -18,6 +18,7 @@ Dump Create subvolume var/tmp on device /dev/sda6 Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos Dump device:/dev/sda1 fsid:0x83 Dump device:/dev/sda2 fsid:0x8e Dump device:/dev/sda3 fsid:0xf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/helper1b.rb new/yast2-storage-3.1.15/testsuite/tests/helper1b.rb --- old/yast2-storage-3.1.14/testsuite/tests/helper1b.rb 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/helper1b.rb 2014-03-28 13:48:39.000000000 +0100 @@ -33,6 +33,19 @@ Testsuite.Dump("Target Map Excerpt:") prop["target"].each do |device, container| + + if Storage.IsDiskType(container.fetch("type", :CT_UNKNOWN)) + + line = "device:#{container["device"]}" + + if container.fetch("label", "") != "" + line << " label:#{container["label"]}" + end + + Testsuite.Dump(line) + + end + container["partitions"].each do |volume| line = "device:#{volume["device"]}" @@ -48,6 +61,7 @@ Testsuite.Dump(line) end + end else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/reuse-home1.out new/yast2-storage-3.1.15/testsuite/tests/reuse-home1.out --- old/yast2-storage-3.1.14/testsuite/tests/reuse-home1.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/reuse-home1.out 2014-03-28 13:48:39.000000000 +0100 @@ -17,6 +17,7 @@ Dump Set mount point of /dev/sda3 to /home Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos Dump device:/dev/sda1 fsid:0x82 Dump device:/dev/sda2 fsid:0x83 Dump device:/dev/sda3 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/windows-only-efi1.out new/yast2-storage-3.1.15/testsuite/tests/windows-only-efi1.out --- old/yast2-storage-3.1.14/testsuite/tests/windows-only-efi1.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/windows-only-efi1.out 2014-03-28 13:48:39.000000000 +0100 @@ -20,6 +20,7 @@ Dump Set mount point of /dev/sda1 to /boot/efi Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:gpt Dump device:/dev/sda1 fsid:0x103 Dump device:/dev/sda2 fsid:0x7 Dump device:/dev/sda3 fsid:0x82 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/windows-only1.out new/yast2-storage-3.1.15/testsuite/tests/windows-only1.out --- old/yast2-storage-3.1.14/testsuite/tests/windows-only1.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/windows-only1.out 2014-03-28 13:48:39.000000000 +0100 @@ -19,6 +19,7 @@ Dump Create subvolume var/tmp on device /dev/sda6 Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos Dump device:/dev/sda1 fsid:0x7 Dump device:/dev/sda2 fsid:0xf Dump device:/dev/sda5 fsid:0x82 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.14/testsuite/tests/windows1.out new/yast2-storage-3.1.15/testsuite/tests/windows1.out --- old/yast2-storage-3.1.14/testsuite/tests/windows1.out 2014-03-19 10:19:21.000000000 +0100 +++ new/yast2-storage-3.1.15/testsuite/tests/windows1.out 2014-03-28 13:48:39.000000000 +0100 @@ -18,6 +18,7 @@ Dump Create subvolume var/tmp on device /dev/sda6 Dump Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos Dump device:/dev/sda1 fsid:0x7 Dump device:/dev/sda2 fsid:0xf Dump device:/dev/sda5 fsid:0x82 continue with "q"... Checked in at Fri Mar 28 16:31:36 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org