Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2012-12-08 15:53:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2012-11-14 09:17:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2012-12-08 15:53:53.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 15 17:27:06 CET 2012 - [email protected] + +- 2.23.2 +- deactivate swap if disk is selected for install in live + installer (bnc#789078) + +------------------------------------------------------------------- Old: ---- yast2-storage-2.23.1.tar.bz2 New: ---- yast2-storage-2.23.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.YT9TfU/_old 2012-12-08 15:53:54.000000000 +0100 +++ /var/tmp/diff_new_pack.YT9TfU/_new 2012-12-08 15:53:54.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 2.23.1 +Version: 2.23.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-storage-2.23.1.tar.bz2 -> yast2-storage-2.23.2.tar.bz2 ++++++ ++++ 5506 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.1/VERSION new/yast2-storage-2.23.2/VERSION --- old/yast2-storage-2.23.1/VERSION 2012-11-13 13:23:57.000000000 +0100 +++ new/yast2-storage-2.23.2/VERSION 2012-12-07 16:56:22.000000000 +0100 @@ -1 +1 @@ -2.23.1 +2.23.2 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.1/configure.in new/yast2-storage-2.23.2/configure.in --- old/yast2-storage-2.23.1/configure.in 2012-09-06 14:32:11.000000000 +0200 +++ new/yast2-storage-2.23.2/configure.in 2012-12-07 16:57:42.000000000 +0100 @@ -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.22.10, http://bugs.opensuse.org/, yast2-storage) +AC_INIT(yast2-storage, 2.23.2, 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.22.10" +VERSION="2.23.2" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <[email protected]>" 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.1/storage/src/inst_target_part.ycp new/yast2-storage-2.23.2/storage/src/inst_target_part.ycp --- old/yast2-storage-2.23.1/storage/src/inst_target_part.ycp 2012-09-17 15:46:05.000000000 +0200 +++ new/yast2-storage-2.23.2/storage/src/inst_target_part.ycp 2012-11-19 11:51:48.000000000 +0100 @@ -211,6 +211,16 @@ else open_auto_dialog (targetname, vbox); boolean disable_full = false; + if( Mode::live_installation() ) + { + partitions = maplist( map p, partitions, + { + if( p["mount"]:""=="swap"&&Storage::TryUnaccessSwap( p["device"]:"" )) + p["mount"] = ""; + return( p ); + }); + target["partitions"] = partitions; + } foreach( map p, partitions, ``{ y2milestone( "p:%1", p ); 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.1/storage/src/modules/Storage.ycp new/yast2-storage-2.23.2/storage/src/modules/Storage.ycp --- old/yast2-storage-2.23.1/storage/src/modules/Storage.ycp 2012-11-05 16:36:20.000000000 +0100 +++ new/yast2-storage-2.23.2/storage/src/modules/Storage.ycp 2012-11-19 11:51:48.000000000 +0100 @@ -4567,7 +4567,7 @@ return( ret ); } -boolean TryUnaccessSwap( string device ) +global boolean TryUnaccessSwap( string device ) { boolean ret = isempty(DeviceMounted(device)); if( !ret && Mode::live_installation() ) 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.1/storage/src/storage_finish.ycp new/yast2-storage-2.23.2/storage/src/storage_finish.ycp --- old/yast2-storage-2.23.1/storage/src/storage_finish.ycp 2012-09-17 15:46:05.000000000 +0200 +++ new/yast2-storage-2.23.2/storage/src/storage_finish.ycp 2012-11-19 11:52:09.000000000 +0100 @@ -99,7 +99,7 @@ if (part["used_fs"]:`unknown == `btrfs) { y2milestone("configuring snapper"); - if ((integer) SCR::Execute(.target.bash, "/usr/bin/snapper create-config --fstype=btrfs /") == 0) + if ((boolean) SCR::Execute(.snapper.create_config, $[ "config_name" : "root", "subvolume" : "/", "fstype" : "btrfs" ])) SCR::Write(.sysconfig.yast2.USE_SNAPPER, "yes"); } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
