Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2014-11-28 08:47:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-15 16:26:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2014-11-28 08:47:18.000000000 +0100 @@ -1,0 +2,14 @@ +Wed Nov 26 17:02:27 CET 2014 - schubi@suse.de + +- Fixed too small dialog for autoyast profile location. + (bnc#897321) +- 3.1.68 + +------------------------------------------------------------------- +Tue Nov 25 10:33:04 UTC 2014 - schubi@suse.com + +- Fixed UI in partition configuration. + (bnc#901904; bnc#901739) +- 3.1.67 + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.66.tar.bz2 New: ---- autoyast2-3.1.68.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.iWQ6j4/_old 2014-11-28 08:47:19.000000000 +0100 +++ /var/tmp/diff_new_pack.iWQ6j4/_new 2014-11-28 08:47:19.000000000 +0100 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.66 +Version: 3.1.68 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-3.1.66.tar.bz2 -> autoyast2-3.1.68.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/.travis.yml new/autoyast2-3.1.68/.travis.yml --- old/autoyast2-3.1.66/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/autoyast2-3.1.68/.travis.yml 2014-11-27 14:39:10.000000000 +0100 @@ -0,0 +1,16 @@ +language: cpp +compiler: + - gcc +before_install: + # disable rvm, use system Ruby + - rvm reset + - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/tra... + - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-storage yast2-xml yast2-transfer yast2-services-manager yast2-installation-control" -g "rspec:2.14.1 yast-rake gettext" +script: + - rake check:syntax + - rake check:pot + - make -f Makefile.cvs + - make + - sudo make install + - make check + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/MAINTAINER new/autoyast2-3.1.68/MAINTAINER --- old/autoyast2-3.1.66/MAINTAINER 2014-10-13 21:39:09.000000000 +0200 +++ new/autoyast2-3.1.68/MAINTAINER 2014-11-27 14:39:10.000000000 +0100 @@ -1 +1 @@ -AutoYaST Maintainers <autoyast-maintainers@suse.de> +Deprecated file. Use `osc maintainer autoyast2` instead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/README.md new/autoyast2-3.1.68/README.md --- old/autoyast2-3.1.66/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/autoyast2-3.1.68/README.md 2014-11-27 14:39:10.000000000 +0100 @@ -0,0 +1,5 @@ +# YaST - The AutoYaST Framework # + +[](https://travis-ci.org/yast/yast-autoinstallation) +[](https://ci.opensuse.org/view/Yast/job/yast-autoinstallation-master/) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/package/autoyast2.changes new/autoyast2-3.1.68/package/autoyast2.changes --- old/autoyast2-3.1.66/package/autoyast2.changes 2014-10-13 21:39:09.000000000 +0200 +++ new/autoyast2-3.1.68/package/autoyast2.changes 2014-11-27 14:39:10.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Wed Nov 26 17:02:27 CET 2014 - schubi@suse.de + +- Fixed too small dialog for autoyast profile location. + (bnc#897321) +- 3.1.68 + +------------------------------------------------------------------- +Tue Nov 25 10:33:04 UTC 2014 - schubi@suse.com + +- Fixed UI in partition configuration. + (bnc#901904; bnc#901739) +- 3.1.67 + +------------------------------------------------------------------- Mon Oct 13 16:32:53 UTC 2014 - lslezak@suse.cz - Fixed "No base product found" error when evaluating diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/package/autoyast2.spec new/autoyast2-3.1.68/package/autoyast2.spec --- old/autoyast2-3.1.66/package/autoyast2.spec 2014-10-13 21:39:09.000000000 +0200 +++ new/autoyast2-3.1.68/package/autoyast2.spec 2014-11-27 14:39:10.000000000 +0100 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.66 +Version: 3.1.68 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/src/include/autoinstall/PartitionDialog.rb new/autoyast2-3.1.68/src/include/autoinstall/PartitionDialog.rb --- old/autoyast2-3.1.66/src/include/autoinstall/PartitionDialog.rb 2014-10-13 21:39:09.000000000 +0200 +++ new/autoyast2-3.1.68/src/include/autoinstall/PartitionDialog.rb 2014-11-27 14:39:10.000000000 +0100 @@ -377,6 +377,7 @@ end def PartitionCheck + unchangedPartition = @currentPartition @currentPartition = updatePartitionDialogData(@currentPartition) Builtins.y2milestone( "PartitionCheck():\n" + @@ -386,9 +387,8 @@ @driveId, @partitionIdx ) - storedPartition = PartitionLoad(@driveId, @partitionIdx) - if !AutoinstPartition.areEqual(@currentPartition, storedPartition) || @dirty + if !AutoinstPartition.areEqual(@currentPartition, unchangedPartition) || @dirty if Popup.YesNo(_("Store unsaved changes to partition?")) @dirty = false if PartitionCheckSanity(@currentPartition) @@ -536,6 +536,9 @@ ) updatePartitionDialogGUI + # Setting currentPartition to some default entries made by + # the UI design. + @currentPartition = updatePartitionDialogData(@currentPartition) nil end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/src/include/autoinstall/autoinst_dialogs.rb new/autoyast2-3.1.68/src/include/autoinstall/autoinst_dialogs.rb --- old/autoyast2-3.1.66/src/include/autoinstall/autoinst_dialogs.rb 2014-10-13 21:39:09.000000000 +0200 +++ new/autoyast2-3.1.68/src/include/autoinstall/autoinst_dialogs.rb 2014-11-27 14:39:10.000000000 +0100 @@ -32,16 +32,18 @@ UI.OpenDialog( Opt(:decorated), HBox( - HWeight(50, RichText(helptext)), + HWeight(30, RichText(helptext)), HStretch(), HSpacing(1), HWeight( - 50, + 70, VBox( Heading(title), VSpacing(1), VStretch(), - Left(TextEntry(Id(:uri), _("&Profile Location:"), original)), + MinWidth(60, + Left(TextEntry(Id(:uri), _("&Profile Location:"), original)) + ), VSpacing(1), VStretch(), HBox( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/src/modules/AutoinstPartPlan.rb new/autoyast2-3.1.68/src/modules/AutoinstPartPlan.rb --- old/autoyast2-3.1.66/src/modules/AutoinstPartPlan.rb 2014-10-13 21:39:09.000000000 +0200 +++ new/autoyast2-3.1.68/src/modules/AutoinstPartPlan.rb 2014-11-27 14:39:10.000000000 +0100 @@ -680,26 +680,33 @@ def Summary summary = "" summary = Summary.AddHeader(summary, _("Drives")) - num = Builtins.size(@AutoPartPlan) - summary = Summary.AddLine( - summary, - Builtins.sformat(_("Total of %1 drive"), num) - ) - summary = Summary.OpenList(summary) - Builtins.foreach(@AutoPartPlan) do |drive| - driveDesc = AutoinstDrive.getNodeName(drive, true) - summary = Summary.AddListItem(summary, driveDesc) + unless @AutoPartPlan.empty? + # We are counting harddisks only (type CT_DISK) + num = @AutoPartPlan.count{|drive| drive["type"] == :CT_DISK } + summary = Summary.AddLine( + summary, + (n_("%s drive in total", "%s drives in total", num) % num) + ) summary = Summary.OpenList(summary) - Builtins.foreach(Ops.get_list(drive, "partitions", [])) do |part| - summary = Summary.AddListItem( - summary, - AutoinstPartition.getPartitionDescription(part, true) - ) + Builtins.foreach(@AutoPartPlan) do |drive| + driveDesc = AutoinstDrive.getNodeName(drive, true) + summary = Summary.AddListItem(summary, driveDesc) + summary = Summary.OpenList(summary) + Builtins.foreach(Ops.get_list(drive, "partitions", [])) do |part| + summary = Summary.AddListItem( + summary, + AutoinstPartition.getPartitionDescription(part, true) + ) + end + summary = Summary.CloseList(summary) + summary = Summary.AddNewLine(summary) end summary = Summary.CloseList(summary) - summary = Summary.AddNewLine(summary) + else + summary = Summary.AddLine( summary, + _("Not yet cloned.") + ) end - summary = Summary.CloseList(summary) summary end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/src/modules/AutoinstPartition.rb new/autoyast2-3.1.68/src/modules/AutoinstPartition.rb --- old/autoyast2-3.1.66/src/modules/AutoinstPartition.rb 2014-10-13 21:39:09.000000000 +0200 +++ new/autoyast2-3.1.68/src/modules/AutoinstPartition.rb 2014-11-27 14:39:10.000000000 +0100 @@ -20,6 +20,7 @@ Yast.import "AutoinstCommon" Yast.import "Partitions" Yast.import "FileSystems" + Yast.import "Storage" textdomain "autoinst" @@ -121,33 +122,32 @@ p = deep_copy(p) part_desc = Ops.get_string(p, "mount", "") if "" == part_desc - part_desc = Ops.get_string(p, "lvm_group", "") - if enableHTML - part_desc = Builtins.sformat( - "Physical volume for volume group <<b>%1</b>>", - part_desc - ) + if p["lvm_group"] && !p["lvm_group"].empty? + part_desc = p["lvm_group"] + if enableHTML + part_desc = "Physical volume for volume group <<b>#{part_desc}</b>>" + else + part_desc = "<#{part_desc}>" + end else - part_desc = Builtins.sformat("<%1>", part_desc) + part_desc = "Physical volume" end else if enableHTML - part_desc = Builtins.sformat("<b>%1</b> Partition", part_desc) + part_desc = Builtins.sformat("<b>%1</b> partition", part_desc) end end if Ops.get_boolean(p, "create", false) - part_desc = Builtins.sformat( - "%1 with %2", - part_desc, - Ops.get_string(p, "size", "") - ) + if p["size"] && !p["size"].empty? + part_desc += " with #{Storage.ByteToHumanString(p["size"].to_i)}" + end else if Ops.get_boolean(p, "resize", false) part_desc = Builtins.sformat( "%1 resize part.%2 to %3", part_desc, Ops.get_integer(p, "partition_nr", 999), - Ops.get_string(p, "size", "") + Storage.ByteToHumanString(p["size"].to_i) ) else part_desc = Builtins.sformat( @@ -258,6 +258,11 @@ Ops.get_symbol(part, "filesystem", :Empty) ) newPart = set(newPart, "format", true) + elsif Mode.config + # We are in the autoyast configuration mode. So if the parsed + # system partitions do not have a filesystem entry (E.G. Raids) + # we are not using the default entry (Partitions.DefaultFs). + newPart["filesystem"] = :Empty end if Ops.get_boolean(newPart, "format", false) && !Builtins.isempty(Ops.get_string(part, "mkfs_options", "")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/test/AutoInstallRules_test.rb new/autoyast2-3.1.68/test/AutoInstallRules_test.rb --- old/autoyast2-3.1.66/test/AutoInstallRules_test.rb 2014-10-13 21:39:09.000000000 +0200 +++ new/autoyast2-3.1.68/test/AutoInstallRules_test.rb 2014-11-27 14:39:10.000000000 +0100 @@ -74,6 +74,7 @@ it "reads installed product properties from content file" do expect(Yast::SCR).to receive(:Read).with(Yast::Path.new(".probe.bios")).and_return([]) expect(Yast::SCR).to receive(:Read).with(Yast::Path.new(".probe.memory")).and_return([]) + expect(Yast::Arch).to receive(:architecture).and_return("x86_64") expect(Yast::Kernel).to receive(:GetPackages).and_return([]) expect(Yast::SCR).to receive(:Execute).with(Yast::Path.new(".target.bash_output"), "/bin/hostname") expect(Yast::SCR).to receive(:Read).with(Yast::Path.new(".etc.install_inf.Domain")) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org