Hello community, here is the log from the commit of package yast2-update for openSUSE:Factory checked in at 2016-08-31 00:02:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-update (Old) and /work/SRC/openSUSE:Factory/.yast2-update.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-update" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-update/yast2-update.changes 2016-08-18 10:18:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-update.new/yast2-update.changes 2016-08-31 00:02:24.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Aug 26 08:54:40 UTC 2016 - [email protected] + +- The update installer has been moved earlier in the workflow. We + don't need to store data to remember selected target/partitions + anymore. (bsc#988287) +- 3.1.42 + +------------------------------------------------------------------- Old: ---- yast2-update-3.1.41.tar.bz2 New: ---- yast2-update-3.1.42.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.VGQLq8/_old 2016-08-31 00:02:25.000000000 +0200 +++ /var/tmp/diff_new_pack.VGQLq8/_new 2016-08-31 00:02:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.41 +Version: 3.1.42 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-update-3.1.41.tar.bz2 -> yast2-update-3.1.42.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.41/CONTRIBUTING.md new/yast2-update-3.1.42/CONTRIBUTING.md --- old/yast2-update-3.1.41/CONTRIBUTING.md 2016-08-09 12:24:39.000000000 +0200 +++ new/yast2-update-3.1.42/CONTRIBUTING.md 2016-08-26 13:34:46.000000000 +0200 @@ -3,7 +3,7 @@ YaST is an open source project and as such it welcomes all kinds of contributions. If you decide to contribute, please follow these guidelines to -ensure the process is effective and pleasant both for you and YaST maintainers. +ensure the process is effective and pleasant both for you and the YaST maintainers. There are two main forms of contribution: reporting bugs and performing code changes. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - When creating a bug report, please follow our [bug reporting guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). +We can't guarantee that every bug will be fixed, but we'll try. + Code Changes ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 4. Update the package version (in `packages/*.spec`, usually by + `rake version:bump`) and add a new entry to the `package/*.changes` file + (by `osc vc package`). + For bigger changes or changes which need longer discussion it is advised to + add this as a separate last commit so it can be easily updated when another + change is merged in the meantime. + + 5. Make sure your change didn't break anything by building the RPM package (`rake osc:build`). The build process includes running the full testsuite. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 8. Finally, the pull request will get merged or rejected. See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.41/package/yast2-update.changes new/yast2-update-3.1.42/package/yast2-update.changes --- old/yast2-update-3.1.41/package/yast2-update.changes 2016-08-09 12:24:39.000000000 +0200 +++ new/yast2-update-3.1.42/package/yast2-update.changes 2016-08-26 13:34:46.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Aug 26 08:54:40 UTC 2016 - [email protected] + +- The update installer has been moved earlier in the workflow. We + don't need to store data to remember selected target/partitions + anymore. (bsc#988287) +- 3.1.42 + +------------------------------------------------------------------- Fri Aug 5 08:55:42 UTC 2016 - [email protected] - Remember selected target/partitions after an installer update. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.41/package/yast2-update.spec new/yast2-update-3.1.42/package/yast2-update.spec --- old/yast2-update-3.1.41/package/yast2-update.spec 2016-08-09 12:24:39.000000000 +0200 +++ new/yast2-update-3.1.42/package/yast2-update.spec 2016-08-26 13:34:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.41 +Version: 3.1.42 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.41/src/lib/update/clients/inst_update_partition_auto.rb new/yast2-update-3.1.42/src/lib/update/clients/inst_update_partition_auto.rb --- old/yast2-update-3.1.41/src/lib/update/clients/inst_update_partition_auto.rb 2016-08-09 12:24:39.000000000 +0200 +++ new/yast2-update-3.1.42/src/lib/update/clients/inst_update_partition_auto.rb 2016-08-26 13:34:46.000000000 +0200 @@ -41,10 +41,6 @@ Yast.include self, "update/rootpart.rb" - # In case of restarting after a installer update, we restore previous - # data if exists (bsc#988287) - load_data if Installation.restarting? && data_stored? - if RootPart.Mounted log.debug("RootPart is mounted, detaching Update & unmounting partitions") Update.Detach @@ -80,53 +76,15 @@ UmountMountedPartition() Pkg.TargetFinish else - store_data - return :next end end @ret = RootPartitionDialog(:update_dialog) - - store_data if @ret == :next - - @ret end private - # @return [Boolean] true if dumped file data exists. - def data_stored? - ::File.exist?(DATA_PATH) - end - - # Save some important RootPart attributes into a yaml file. - def store_data - data = { - "activated" => RootPart.GetActivated, - "selected" => RootPart.selectedRootPartition, - "previous" => RootPart.previousRootPartition, - "partitions" => RootPart.rootPartitions - } - - File.write(DATA_PATH, data.to_yaml) - end - - # Loads RootPart data from a dump yaml file and delete the file after that. - # It also remember the current root selection as the target_system - def load_data - data = YAML.load(File.read(DATA_PATH)) - - log.debug("Loading data from dump file: #{data}") - RootPart.load_saved(data) - - root_target = RootPart.selectedRootPartition || "" - - @target_system = root_target unless root_target.empty? - - ::FileUtils.rm_rf(DATA_PATH) - end - # Obtains the target system from the install.inf file or use the current # partitions if there is only 1 valid. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.41/test/helpers.rb new/yast2-update-3.1.42/test/helpers.rb --- old/yast2-update-3.1.41/test/helpers.rb 2016-08-09 12:24:39.000000000 +0200 +++ new/yast2-update-3.1.42/test/helpers.rb 2016-08-26 13:34:46.000000000 +0200 @@ -15,6 +15,5 @@ allow(subject).to receive(:target_distribution).and_return("sle-12-x86_64") allow(subject).to receive(:initialize_update_rootpart) allow(subject).to receive(:load_data) - allow(subject).to receive(:store_data) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.41/test/inst_update_partition_auto_test.rb new/yast2-update-3.1.42/test/inst_update_partition_auto_test.rb --- old/yast2-update-3.1.41/test/inst_update_partition_auto_test.rb 2016-08-09 12:24:39.000000000 +0200 +++ new/yast2-update-3.1.42/test/inst_update_partition_auto_test.rb 2016-08-26 13:34:46.000000000 +0200 @@ -10,13 +10,10 @@ describe Yast::InstUpdatePartitionAutoClient do describe "#main" do - let(:restarting) { false } - before do stub_root_part stub_const("Yast::FileSystems", double) allow(Yast::Update) - allow(Yast::Installation).to receive(:restarting?) { restarting } allow(Yast::Installation).to receive(:destdir).and_return("/mnt") allow(Yast::Report).to receive(:error) allow(Yast::Pkg).to receive(:TargetInitializeOptions) @@ -25,17 +22,6 @@ stub_subject(subject) end - context "when installation is restarting" do - let(:restarting) { true } - - it "loads data if it was stored" do - expect(subject).to receive(:data_stored?).and_return(true) - expect(subject).to receive(:load_data) - - subject.main - end - end - context "when root partition is mounted" do before do allow(Yast::RootPart).to receive(:Mounted).and_return(true) @@ -117,7 +103,6 @@ context "when the target system is mounted successfully" do before do allow(Yast::RootPart).to receive(:mount_target).and_return(true) - allow(subject).to receive(:store_data) end context "when it detects an incomplete installation" do @@ -174,13 +159,6 @@ allow(Yast::Pkg).to receive(:TargetInitializeOptions).and_return(true) end - it "saves current data" do - expect(subject).not_to receive(:RootPartitionDialog) - expect(subject).to receive(:store_data) - - subject.main - end - it "returns :next without shown selection dialog" do expect(subject).not_to receive(:RootPartitionDialog) @@ -197,12 +175,6 @@ allow(subject).to receive(:target_system_candidate).and_return(nil) end - it "stores current data" do - expect(subject).to receive(:store_data) - - subject.main - end - it "returns :next" do expect(subject.main).to eql(:next) end
