Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2012-12-21 10:39:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-storage", Maintainer is "ASchnell@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2012-12-08 15:53:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2012-12-21 10:39:38.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Dec 19 19:46:23 CET 2012 - fehr@suse.de + +- version 2.23.3 +- prevent removal of crypt helper devices when doing fstab import + (bnc#794692) + +------------------------------------------------------------------- Old: ---- yast2-storage-2.23.2.tar.bz2 New: ---- yast2-storage-2.23.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.zClyfd/_old 2012-12-21 10:39:39.000000000 +0100 +++ /var/tmp/diff_new_pack.zClyfd/_new 2012-12-21 10:39:39.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 2.23.2 +Version: 2.23.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,7 +39,7 @@ BuildRequires: yast2-devtools BuildRequires: yast2-perl-bindings BuildRequires: yast2-testsuite >= 2.19.0 -Requires: libstorage4 >= 2.23.1 +Requires: libstorage4 >= 2.23.3 Requires: perl = %{perl_version} Requires: yast2 >= 2.19.4 Requires: yast2-core >= 2.18.3 ++++++ yast2-storage-2.23.2.tar.bz2 -> yast2-storage-2.23.3.tar.bz2 ++++++ ++++ 5530 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.23.2/VERSION new/yast2-storage-2.23.3/VERSION --- old/yast2-storage-2.23.2/VERSION 2012-12-07 16:56:22.000000000 +0100 +++ new/yast2-storage-2.23.3/VERSION 2012-12-20 13:02:23.000000000 +0100 @@ -1 +1 @@ -2.23.2 +2.23.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.23.2/configure.in new/yast2-storage-2.23.3/configure.in --- old/yast2-storage-2.23.2/configure.in 2012-12-07 16:57:42.000000000 +0100 +++ new/yast2-storage-2.23.3/configure.in 2012-09-06 14:32:11.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.23.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-storage, 2.23.2, http://bugs.opensuse.org/, yast2-storage) +AC_INIT(yast2-storage, 2.22.10, http://bugs.opensuse.org/, yast2-storage) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.23.2" +VERSION="2.22.10" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <aschnell@suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.23.2/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.23.3/storage/src/include/custom_part_lib.ycp --- old/yast2-storage-2.23.2/storage/src/include/custom_part_lib.ycp 2012-11-19 11:51:48.000000000 +0100 +++ new/yast2-storage-2.23.3/storage/src/include/custom_part_lib.ycp 2012-12-19 19:45:30.000000000 +0100 @@ -876,7 +876,7 @@ return false; } - if (Storage::Umount(device)) + if (Storage::Umount(device,true)) return true; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.23.2/storage/src/include/ep-import.ycp new/yast2-storage-2.23.3/storage/src/include/ep-import.ycp --- old/yast2-storage-2.23.2/storage/src/include/ep-import.ycp 2012-11-19 11:51:48.000000000 +0100 +++ new/yast2-storage-2.23.3/storage/src/include/ep-import.ycp 2012-12-20 11:31:52.000000000 +0100 @@ -79,7 +79,7 @@ y2milestone("MountVar d:%1", d); if( !d["isdir"]:false ) ret = ""; - Storage::Umount( ret ); + Storage::Umount( ret, false ); } else ret = ""; @@ -153,7 +153,7 @@ if (s != size(fstab)) y2milestone("FindExistingFstabs fstab:%1", fstab); if (!isempty(vardev)) - Storage::Umount( vardev ); + Storage::Umount( vardev, false ); } if (!isempty(fstab)) @@ -163,7 +163,7 @@ // unmount if( mount_success ) - Storage::Umount(part_device); + Storage::Umount(part_device,false); }); }); y2milestone("FindExistingFstabs size(fstabs):%1", size(fstabs)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.23.2/storage/src/modules/Storage.ycp new/yast2-storage-2.23.3/storage/src/modules/Storage.ycp --- old/yast2-storage-2.23.2/storage/src/modules/Storage.ycp 2012-11-19 11:51:48.000000000 +0100 +++ new/yast2-storage-2.23.3/storage/src/modules/Storage.ycp 2012-12-20 11:45:18.000000000 +0100 @@ -4388,10 +4388,10 @@ * * @see Mount() */ -global boolean Umount( string dev ) +global boolean Umount( string dev, boolean unsetup ) { - boolean ret = LibStorage::StorageInterface::umountDevice( sint, dev ); - y2milestone( "Umount %1 ret %2", dev, ret ); + boolean ret = LibStorage::StorageInterface::umountDeviceUns( sint, dev, unsetup ); + y2milestone( "Umount %1 unsetup %2 ret %3", dev, unsetup, ret ); return( ret ); } @@ -4572,7 +4572,7 @@ boolean ret = isempty(DeviceMounted(device)); if( !ret && Mode::live_installation() ) { - ret = Umount( device ); + ret = Umount( device, true ); } y2milestone( "TryUnaccessSwap device %1 ret:%2", device, ret ); return(ret); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org