Hello community, here is the log from the commit of package yast2-update for openSUSE:Factory checked in at 2018-03-18 21:43:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-update (Old) and /work/SRC/openSUSE:Factory/.yast2-update.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-update" Sun Mar 18 21:43:28 2018 rev:118 rq:587495 version:4.0.11 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-update/yast2-update.changes 2018-03-11 18:02:17.745320196 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-update.new/yast2-update.changes 2018-03-18 21:43:30.928586759 +0100 @@ -1,0 +2,10 @@ +Wed Mar 14 15:42:22 UTC 2018 - [email protected] + +- Properly restore the original installation repositories when + going back to the partition selection dialog (related to + bsc#1080979) +- Remove the very old and unused stuff (dead code, unsupported + file systems, ...) +- 4.0.11 + +------------------------------------------------------------------- Old: ---- yast2-update-4.0.10.tar.bz2 New: ---- yast2-update-4.0.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.mJ2A4M/_old 2018-03-18 21:43:31.532564999 +0100 +++ /var/tmp/diff_new_pack.mJ2A4M/_new 2018-03-18 21:43:31.536564855 +0100 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 4.0.10 +Version: 4.0.11 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -101,7 +101,6 @@ %files %defattr(-,root,root) -%{yast_ybindir}/* %dir %{yast_moduledir} %{yast_moduledir}/* ++++++ yast2-update-4.0.10.tar.bz2 -> yast2-update-4.0.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.0.10/POTFILES new/yast2-update-4.0.11/POTFILES --- old/yast2-update-4.0.10/POTFILES 2018-03-08 10:57:33.000000000 +0100 +++ new/yast2-update-4.0.11/POTFILES 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -control/update.glade diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.0.10/data/know_downgrade new/yast2-update-4.0.11/data/know_downgrade --- old/yast2-update-4.0.10/data/know_downgrade 2018-03-08 10:57:33.000000000 +0100 +++ new/yast2-update-4.0.11/data/know_downgrade 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -# list of known downgrades - -Package: libpng -Version old: 2.1.0.12 -Version new: 1.2.3 --- - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.0.10/package/yast2-update.changes new/yast2-update-4.0.11/package/yast2-update.changes --- old/yast2-update-4.0.10/package/yast2-update.changes 2018-03-08 10:57:33.000000000 +0100 +++ new/yast2-update-4.0.11/package/yast2-update.changes 2018-03-15 13:34:54.000000000 +0100 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Mar 14 15:42:22 UTC 2018 - [email protected] + +- Properly restore the original installation repositories when + going back to the partition selection dialog (related to + bsc#1080979) +- Remove the very old and unused stuff (dead code, unsupported + file systems, ...) +- 4.0.11 + +------------------------------------------------------------------- Thu Mar 8 09:25:38 UTC 2018 - [email protected] - Automatically save a solver test case when the product summary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.0.10/package/yast2-update.spec new/yast2-update-4.0.11/package/yast2-update.spec --- old/yast2-update-4.0.10/package/yast2-update.spec 2018-03-08 10:57:33.000000000 +0100 +++ new/yast2-update-4.0.11/package/yast2-update.spec 2018-03-15 13:34:54.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 4.0.10 +Version: 4.0.11 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -101,7 +101,6 @@ %files %defattr(-,root,root) -%{yast_ybindir}/* %dir %{yast_moduledir} %{yast_moduledir}/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.0.10/src/Makefile.am new/yast2-update-4.0.11/src/Makefile.am --- old/yast2-update-4.0.10/src/Makefile.am 2018-03-08 10:57:33.000000000 +0100 +++ new/yast2-update-4.0.11/src/Makefile.am 2018-03-15 13:34:54.000000000 +0100 @@ -21,10 +21,6 @@ ynclude_DATA = \ include/update/rootpart.rb -ybin_SCRIPTS = \ - bin/update_users_groups \ - bin/remove_junk - desktop_DATA = \ desktop/update.desktop @@ -32,6 +28,6 @@ ylibclient_DATA = \ lib/update/clients/inst_update_partition_auto.rb -EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(ybin_SCRIPTS) $(desktop_DATA) $(ylibclient_DATA) +EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(desktop_DATA) $(ylibclient_DATA) include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.0.10/src/bin/remove_junk new/yast2-update-4.0.11/src/bin/remove_junk --- old/yast2-update-4.0.10/src/bin/remove_junk 2018-03-08 10:57:33.000000000 +0100 +++ new/yast2-update-4.0.11/src/bin/remove_junk 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -#!/bin/bash - -# remove old YaST directory from YaST1 era -if test -d $1/var/lib/YaST ; then - /bin/rm -fr $1/var/lib/YaST -fi - -if test -d $1/var/lib/YaST2 ; then - # place here files from dropped modules -fi - -# remove old you stuff which can be quite big -if test -d $1/var/lib/YaST2/you ; then - /bin/rm -f $1/var/lib/YaST2/you/quickcheck - /bin/rm -fr $1/var/lib/YaST2/you/{files,installed,mnt,scripts} -fi - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.0.10/src/bin/update_users_groups new/yast2-update-4.0.11/src/bin/update_users_groups --- old/yast2-update-4.0.10/src/bin/update_users_groups 2018-03-08 10:57:33.000000000 +0100 +++ new/yast2-update-4.0.11/src/bin/update_users_groups 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -#!/bin/bash -# -# script to add missing passwd or group entries -# before update -# -# call as "fill_passd_group <target-dir>" -# /etc/x == file from inst-sys -# $1/etc/x == file from target -# -# Rename game -> games, wwwadmin -> www -for i in $1/etc/group $1/etc/gshadow ; do - if test -e $i ; then - sed -e "s|^game:|games:|" -e "s|^wwwadmin:|www:|" $i > $i.t - cat $i.t > $i - rm -f $i.t - fi -done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.0.10/src/clients/inst_update_partition.rb new/yast2-update-4.0.11/src/clients/inst_update_partition.rb --- old/yast2-update-4.0.10/src/clients/inst_update_partition.rb 2018-03-08 10:57:33.000000000 +0100 +++ new/yast2-update-4.0.11/src/clients/inst_update_partition.rb 2018-03-15 13:34:54.000000000 +0100 @@ -2,7 +2,7 @@ # ------------------------------------------------------------------------------ # Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. -# +# Copyright (c) 2018 SUSE LLC, All Rights Reserved. # # This program is free software; you can redistribute it and/or modify it under # the terms of version 2 of the GNU General Public License as published by the @@ -28,9 +28,11 @@ # RootPart::rootPartitions must be filled before # calling this module. # -# $Id$ + module Yast class InstUpdatePartitionClient < Client + include Yast::Logger + def main Yast.import "UI" Yast.import "Pkg" @@ -38,9 +40,18 @@ Yast.import "ProductControl" Yast.import "RootPart" + Yast.import "GetInstArgs" Yast.include self, "update/rootpart.rb" + if Yast::GetInstArgs.going_back + # if going back restore the initial installation repositories + restore_installation_repos + else + # if going forward save the installation repos for later + save_installation_repos + end + if RootPart.Mounted Update.restore_backup Update.Detach @@ -61,6 +72,33 @@ @ret end + + private + + # restore the repository setup from the saved config + def restore_installation_repos + log.info("Restoring the initial repository setup") + + # drop the currently loaded repositories + Yast::Pkg.SourceFinishAll + # move the target from "/mnt" to "/" + Yast::Pkg.TargetFinish + Yast::Pkg.TargetInitialize("/") + # load the previous repositories from the inst-sys ("/") + Yast::Pkg.SourceRestore + Yast::Pkg.SourceLoad + + restored = Yast::Pkg.SourceGetCurrent(false).map do |r| + Yast::Pkg.SourceGeneralData(r)["url"] + end + log.info("Restored repositories: #{restored}") + end + + # save the current repository setup + def save_installation_repos + log.info("Storing a backup of the current repository setup") + Yast::Pkg.SourceSaveAll + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.0.10/src/modules/RootPart.rb new/yast2-update-4.0.11/src/modules/RootPart.rb --- old/yast2-update-4.0.10/src/modules/RootPart.rb 2018-03-08 10:57:33.000000000 +0100 +++ new/yast2-update-4.0.11/src/modules/RootPart.rb 2018-03-15 13:34:54.000000000 +0100 @@ -1127,11 +1127,8 @@ "ext3", "ext4", "btrfs", - "minix", - "reiserfs", "jfs", "xfs", - "xiafs", "hpfs", "vfat", "auto", @@ -1152,8 +1149,6 @@ success = true - raidMounted = false - Builtins.foreach(fstab) do |mounts| vfstype = Ops.get_string(mounts, "vfstype", "") mntops = Ops.get_string(mounts, "mntops", "") @@ -2004,7 +1999,6 @@ return if @didSearchForRootPartitions modules_to_load = { - "reiserfs" => "Reiser FS", "xfs" => "XFS", "ext3" => "Ext3", "ext4" => "Ext4", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.0.10/src/modules/Update.rb new/yast2-update-4.0.11/src/modules/Update.rb --- old/yast2-update-4.0.10/src/modules/Update.rb 2018-03-08 10:57:33.000000000 +0100 +++ new/yast2-update-4.0.11/src/modules/Update.rb 2018-03-15 13:34:54.000000000 +0100 @@ -742,20 +742,8 @@ def Detach # release mounted devices Pkg.SourceReleaseAll - - # remove all repos except the initial installation repository - # to close the solv files and allow unmounting the target - repos_to_delete = Pkg.SourceGetCurrent(false) - repos_to_delete.delete(0) - log.info "Removing repositories: #{repos_to_delete}" - - # the changes are not saved to the target system, the repositories - # are removed only from pkg-bindings - repos_to_delete.each do |repo_to_delete| - Pkg.SourceDelete(repo_to_delete) - end - Pkg.TargetFinish + @did_init1 = false @did_init2 = false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.0.10/test/test_helper.rb new/yast2-update-4.0.11/test/test_helper.rb --- old/yast2-update-4.0.10/test/test_helper.rb 2018-03-08 10:57:33.000000000 +0100 +++ new/yast2-update-4.0.11/test/test_helper.rb 2018-03-15 13:34:54.000000000 +0100 @@ -4,6 +4,11 @@ require "yast/rspec" require_relative "helpers" +# make sure we run the tests in English locale +# (some tests check the output which is marked for translation) +ENV["LANG"] = "en_US.UTF-8" +ENV["LC_ALL"] = "en_US.UTF-8" + RSpec.configure do |config| config.extend Yast::I18n # available in context/describe config.include Yast::I18n # available in it/let/before
