Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2011-11-02 12:22:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2011-10-28 15:33:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2011-11-02 12:22:59.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 31 18:38:21 CET 2011 - [email protected] + +- version 2.21.12 +- improve detection of /home partition (bnc#727362) + +------------------------------------------------------------------- Old: ---- yast2-storage-2.21.11.tar.bz2 New: ---- yast2-storage-2.21.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.awm558/_old 2011-11-02 12:23:00.000000000 +0100 +++ /var/tmp/diff_new_pack.awm558/_new 2011-11-02 12:23:00.000000000 +0100 @@ -19,11 +19,11 @@ Name: yast2-storage -Version: 2.21.11 +Version: 2.21.12 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.21.11.tar.bz2 +Source0: yast2-storage-2.21.12.tar.bz2 Prefix: /usr @@ -55,7 +55,7 @@ devices during installation and on an installed system. %prep -%setup -n yast2-storage-2.21.11 +%setup -n yast2-storage-2.21.12 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-storage-2.21.11.tar.bz2 -> yast2-storage-2.21.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.11/VERSION new/yast2-storage-2.21.12/VERSION --- old/yast2-storage-2.21.11/VERSION 2011-10-24 16:14:57.000000000 +0200 +++ new/yast2-storage-2.21.12/VERSION 2011-10-31 18:45:50.000000000 +0100 @@ -1 +1 @@ -2.21.11 +2.21.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.11/storage/src/modules/Storage.ycp new/yast2-storage-2.21.12/storage/src/modules/Storage.ycp --- old/yast2-storage-2.21.11/storage/src/modules/Storage.ycp 2011-10-26 00:27:52.000000000 +0200 +++ new/yast2-storage-2.21.12/storage/src/modules/Storage.ycp 2011-10-31 18:46:28.000000000 +0100 @@ -19,7 +19,7 @@ * wurde versucht "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen n�her erkl�rt. * - * $Id: Storage.ycp 66586 2011-10-25 22:27:50Z fehr $ + * $Id: Storage.ycp 66645 2011-10-31 17:46:27Z fehr $ */ { module "Storage"; @@ -4318,7 +4318,7 @@ } -boolean DetectHomeFs( map p ) +global boolean DetectHomeFs( map p ) { y2milestone( "DetectHomeFs p:%1", p ); boolean ret = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.11/storage/src/modules/StorageProposal.ycp new/yast2-storage-2.21.12/storage/src/modules/StorageProposal.ycp --- old/yast2-storage-2.21.11/storage/src/modules/StorageProposal.ycp 2011-10-24 16:09:05.000000000 +0200 +++ new/yast2-storage-2.21.12/storage/src/modules/StorageProposal.ycp 2011-10-31 18:37:21.000000000 +0100 @@ -411,6 +411,7 @@ map<string, boolean> swapable = $[]; +map<string, boolean> ishome = $[]; global void flex_init_swapable(map<string, map> tg) @@ -2915,10 +2916,19 @@ Storage::CanDelete( p, disk, false ))); if( size(pl)>0 ) { + foreach( map p, pl, + ``{ + if( !haskey( ishome, p["device"]:"" )) + ishome[p["device"]:""] = Storage::DetectHomeFs(p); + }); pl = sort( map a, map b, pl, ``(a["size_k"]:0>b["size_k"]:0)); - pl = (list<map>) union( - filter( map p, pl, ``(!Storage::IsUsedBy(p)) ), + list<map> l1 = filter( map p, pl, ``(!Storage::IsUsedBy(p)) ); + l1 = (list<map>) union( + filter( map p, l1, ``(!ishome[p["device"]:""]:false) ), + filter( map p, l1, ``(ishome[p["device"]:""]:false) )); + + pl = (list<map>) union( l1, filter( map p, pl, ``(Storage::IsUsedBy(p)) )); partitions = -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
