Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at Fri Sep 9 11:58:14 CEST 2011.
-------- --- yast2-storage/yast2-storage.changes 2011-08-25 13:11:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2011-09-08 17:19:11.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Sep 5 16:01:05 CEST 2011 - [email protected] + +- version 2.21.6 +- fix detection and handling of label on btrfs +- use "btrfs filesystem label" to handle label on btrfs +- fix wrong size check for tmpfs +- fixed potential confusing text about disk init (bnc#715801) + +------------------------------------------------------------------- +Mon Aug 29 14:37:26 CEST 2011 - [email protected] + +- use less space for proposal in ncurses (bnc#713314) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-storage-2.21.5.tar.bz2 New: ---- yast2-storage-2.21.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.u8IaLD/_old 2011-09-09 11:58:08.000000000 +0200 +++ /var/tmp/diff_new_pack.u8IaLD/_new 2011-09-09 11:58:08.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-storage -Version: 2.21.5 +Version: 2.21.6 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.21.5.tar.bz2 +Source0: yast2-storage-2.21.6.tar.bz2 Prefix: /usr @@ -55,7 +55,7 @@ devices during installation and on an installed system. %prep -%setup -n yast2-storage-2.21.5 +%setup -n yast2-storage-2.21.6 %build %{prefix}/bin/y2tool y2autoconf @@ -149,4 +149,5 @@ %defattr(-,root,root) %doc %{prefix}/share/doc/packages/yast2-storage/autodocs %doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description + %changelog ++++++ yast2-storage-2.21.5.tar.bz2 -> yast2-storage-2.21.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.5/VERSION new/yast2-storage-2.21.6/VERSION --- old/yast2-storage-2.21.5/VERSION 2011-08-25 13:06:02.000000000 +0200 +++ new/yast2-storage-2.21.6/VERSION 2011-09-08 12:05:51.000000000 +0200 @@ -1 +1 @@ -2.21.5 +2.21.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.5/storage/src/include/custom_part_dialogs.ycp new/yast2-storage-2.21.6/storage/src/include/custom_part_dialogs.ycp --- old/yast2-storage-2.21.5/storage/src/include/custom_part_dialogs.ycp 2011-08-10 16:48:49.000000000 +0200 +++ new/yast2-storage-2.21.6/storage/src/include/custom_part_dialogs.ycp 2011-09-05 17:12:22.000000000 +0200 @@ -16,7 +16,7 @@ * ************************************************************* - $Id: custom_part_dialogs.ycp 65305 2011-08-10 14:48:48Z fehr $ + $Id: custom_part_dialogs.ycp 65555 2011-09-05 15:12:21Z fehr $ */ { @@ -202,39 +202,70 @@ string valid_chars = entry[`valid_chars]:""; integer str_length = entry[`str_length]:0; - if( between != [] && (size(query)>0 || !entry[`empty_allowed]:false)) + if( entry[`query_key]:""=="tmpfs_size" ) { - y2milestone( "DoInputChecks entry:%1 query:\"%2\"", entry, query ); - if( between[0]:0 > tointeger(query) || - ( (between[1]:0 != -1) && (between[1]:0 < tointeger(query) ) ) ) + integer sz=0; + integer pospct = search( query, "%" ); + integer posdot = search( query, "." ); + if( posdot == nil ) + posdot = search( query, "," ); + if( posdot!=nil ) { - Popup::Error(entry[`error_text]:""); + Popup::Error(_("No floating point number!")); ret = `error; } - } - if( below != 0 && (size(query)>0 || !entry[`empty_allowed]:false)) - { - y2milestone( "DoInputChecks entry:%1 query:\"%2\"", entry, query ); - if( below < tofloat(query) ) + else { - Popup::Error(entry[`error_text]:""); - ret = `error; + if( pospct!=nil && (between[0]:0 > tointeger(query) || + ( (between[1]:0 != -1) && (between[1]:0 < tointeger(query) )) ) ) + { + Popup::Error(entry[`error_text_percent]:""); + ret = `error; + } + else if( pospct==nil && + (!Storage::HumanStringToByte( query, sz ) || + sz<entry[`min_size]:1 )) + { + Popup::Error(entry[`error_text]:""); + ret = `error; + } } } - if( valid_chars != "" && size(query)>0 && ret != `error ) + else { - if( nil != findfirstnotof( query, valid_chars )) + if( between != [] && (size(query)>0 || !entry[`empty_allowed]:false)) + { + y2milestone( "DoInputChecks entry:%1 query:\"%2\"", entry, query ); + if( between[0]:0 > tointeger(query) || + ( (between[1]:0 != -1) && (between[1]:0 < tointeger(query) ) ) ) + { + Popup::Error(entry[`error_text]:""); + ret = `error; + } + } + if( below != 0 && (size(query)>0 || !entry[`empty_allowed]:false)) + { + y2milestone( "DoInputChecks entry:%1 query:\"%2\"", entry, query ); + if( below < tofloat(query) ) + { + Popup::Error(entry[`error_text]:""); + ret = `error; + } + } + if( valid_chars != "" && size(query)>0 && ret != `error ) + { + if( nil != findfirstnotof( query, valid_chars )) + { + Popup::Error(entry[`error_text]:""); + ret = `error; + } + } + if( str_length != 0 && size(query) > str_length && ret != `error ) { Popup::Error(entry[`error_text]:""); ret = `error; } } - - if( str_length != 0 && size(query) > str_length && ret != `error ) - { - Popup::Error(entry[`error_text]:""); - ret = `error; - } y2milestone( "DoInputChecks value %1 ret %2", query, ret ); return( ret ); } @@ -551,7 +582,6 @@ map enab = $[]; boolean tmp = !contains( no_mountby_type, new["type"]:`primary ); enab[`label] = tmp && FileSystems::MountLabel( new["used_fs"]:`unknown ) && - (new["used_fs"]:`unknown!=`btrfs||new["format"]:false) && new["enc_type"]:`none==`none; enab[`uuid] = tmp && (new["format"]:false || size(new["uuid"]:"")>0) && FileSystems::MountUuid( new["used_fs"]:`unknown ) && diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.5/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.21.6/storage/src/include/custom_part_lib.ycp --- old/yast2-storage-2.21.5/storage/src/include/custom_part_lib.ycp 2011-08-09 16:32:00.000000000 +0200 +++ new/yast2-storage-2.21.6/storage/src/include/custom_part_lib.ycp 2011-09-06 18:11:02.000000000 +0200 @@ -13,7 +13,7 @@ * ************************************************************* * - $Id: custom_part_lib.ycp 65294 2011-08-09 14:31:59Z fehr $ + $Id: custom_part_lib.ycp 65586 2011-09-06 16:02:37Z aschnell $ * */ @@ -715,16 +715,25 @@ { //////////////////////////////////////////////// // modify map new - string fs_string = (string)UI::QueryWidget(`id(`fsid_point), `Value); + string fs_string = String::CutBlanks((string) UI::QueryWidget(`id(`fsid_point), `Value)); y2milestone("HandlePartWidgetChanges fs_string:%1", fs_string ); - fs_string = substring( fs_string, 0, 5 ); - integer fs_int = tointeger( fs_string ); - integer old_id = new["fsid"]:0; - y2milestone( "HandlePartWidgetChanges fs_int:%1 old_id:%2", - fs_int, old_id ); + integer pos = search(fs_string, " "); + if (pos != nil) + fs_string = substring(fs_string, 0, pos); - if( fs_int != old_id ) + integer fs_int = tointeger(fs_string); + if (!isempty(fs_string) && fs_int == nil) + { + // error popup text + Popup::Error(_("Illegal file system ID.")); + } + + integer old_id = new["fsid"]:0; + + y2milestone( "HandlePartWidgetChanges fs_int:%1 old_id:%2", fs_int, old_id ); + + if (fs_int != nil && fs_int != old_id) { new["fsid"] = fs_int; boolean no_fs = contains( [ Partitions::fsid_lvm, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.5/storage/src/inst_disk_proposal.ycp new/yast2-storage-2.21.6/storage/src/inst_disk_proposal.ycp --- old/yast2-storage-2.21.5/storage/src/inst_disk_proposal.ycp 2011-08-15 17:02:24.000000000 +0200 +++ new/yast2-storage-2.21.6/storage/src/inst_disk_proposal.ycp 2011-08-29 14:33:28.000000000 +0200 @@ -193,6 +193,7 @@ `PushButton( `id(`modify), modify_str ) ); +float space = StorageProposal::SaveHeight()?1:2; term contents = `VBox( @@ -202,7 +203,7 @@ `VBox( `MinHeight(8, `RichText(`id(`richtext), changes)), rframe, - `VSpacing(2), + `VSpacing(space), bframe, `VStretch() ), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.5/storage/src/modules/FileSystems.ycp new/yast2-storage-2.21.6/storage/src/modules/FileSystems.ycp --- old/yast2-storage-2.21.5/storage/src/modules/FileSystems.ycp 2011-08-10 16:47:19.000000000 +0200 +++ new/yast2-storage-2.21.6/storage/src/modules/FileSystems.ycp 2011-09-05 16:36:50.000000000 +0200 @@ -8,7 +8,7 @@ * These module contains the supported filesystems and their settings. * * - * $Id: FileSystems.ycp 65302 2011-08-10 14:47:19Z fehr $ + * $Id: FileSystems.ycp 65551 2011-09-05 14:36:49Z fehr $ */ { module "FileSystems"; @@ -332,15 +332,17 @@ }; list< map<symbol, any> > tmpfs_fst_options = [ - $[ `widget : `TextEntry( `id("size"), `opt(`hstretch), + $[ `widget : `TextEntry( `id("tmpfs_size"), `opt(`hstretch), // label text _("Tmpfs &Size"), "" ), - `query_key : "size", - `between : [ 1, 200 ], + `query_key : "tmpfs_size", + `between : [ 1, 200 ], `empty_allowed : true, + `min_size : 100*1024, `valid_chars : "0123456789kKmMgG%", // popup text - `error_text : _("Value must be larger than 0. Try again."), + `error_text : _("Value must be above 100k or between 1% and 200%. Try again."), + `error_text_percent : _("Value must be 1% and 200%. Try again."), `type : `text, `str_opt : "size=%1", `str_scan : "size=\(.*\)", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.5/storage/src/modules/Partitions.ycp new/yast2-storage-2.21.6/storage/src/modules/Partitions.ycp --- old/yast2-storage-2.21.5/storage/src/modules/Partitions.ycp 2011-07-21 18:07:45.000000000 +0200 +++ new/yast2-storage-2.21.6/storage/src/modules/Partitions.ycp 2011-09-05 11:58:22.000000000 +0200 @@ -6,7 +6,7 @@ * * Purpose: Provides information about partitions * - * $Id: Partitions.ycp 64880 2011-07-19 10:14:06Z aschnell $ + * $Id: Partitions.ycp 65527 2011-09-05 09:58:21Z fehr $ */ { module "Partitions"; @@ -770,9 +770,8 @@ text = text + _(" You may initialize the disk partition table to a sane state in the Expert -Partitioner by selecting \"Expert\"->\"Delete Partition Table -and Disk Label\", but this will destroy all data on all partitions of this -disk. +Partitioner by selecting \"Expert\"->\"Create New Partition Table\", +but this will destroy all data on all partitions of this disk. "); } else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.5/storage/src/modules/Storage.ycp new/yast2-storage-2.21.6/storage/src/modules/Storage.ycp --- old/yast2-storage-2.21.5/storage/src/modules/Storage.ycp 2011-08-15 17:03:00.000000000 +0200 +++ new/yast2-storage-2.21.6/storage/src/modules/Storage.ycp 2011-09-05 17:15:08.000000000 +0200 @@ -19,7 +19,7 @@ * wurde versucht "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen n�her erkl�rt. * - * $Id: Storage.ycp 65350 2011-08-15 15:02:59Z fehr $ + * $Id: Storage.ycp 65557 2011-09-05 15:15:07Z fehr $ */ { module "Storage"; @@ -1834,7 +1834,7 @@ filter( map p, tg["/dev/btrfs","partitions"]:[], ``(size(p["devices"]:[])>1)); y2milestone( "HandleBtrfsSimpleVolumes simple %1", simple ); - list<string> keys = [ "subvol", "uuid", "format", "inactive", "mount", "mountby", "used_fs" ]; + list<string> keys = [ "subvol", "uuid", "label", "format", "inactive", "mount", "mountby", "used_fs" ]; foreach( map p, simple, { map mp = GetPartition( tg, p["device"]:"" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.5/storage/src/modules/StorageProposal.ycp new/yast2-storage-2.21.6/storage/src/modules/StorageProposal.ycp --- old/yast2-storage-2.21.5/storage/src/modules/StorageProposal.ycp 2011-08-15 17:02:25.000000000 +0200 +++ new/yast2-storage-2.21.6/storage/src/modules/StorageProposal.ycp 2011-08-29 14:33:28.000000000 +0200 @@ -4097,9 +4097,21 @@ return ret; } +global boolean SaveHeight() + { + map display_info = UI::GetDisplayInfo(); + boolean ret = false; + if( display_info["TextMode"]:false && display_info["Height"]:24 < 40 ) + ret = true; + return(ret); + } + global term AddCommonWidgets() { term vb = `VBox(); + float space = 0.5; + if( SaveHeight() ) + space = 0; vb = add( vb, `Left(`HBox(`HSpacing(3), `CheckBox(`id(`lvm), `opt(`notify), // Label text @@ -4108,19 +4120,19 @@ `Left(`HBox(`HSpacing(7), `CheckBox(`id(`encrypt), `opt(`notify), // Label text _("Encr&ypt Volume Group"), GetProposalEncrypt())))); - vb = add( vb, `VSpacing(0.5) ); + vb = add( vb, `VSpacing(space) ); vb = add( vb, `Left(`HBox(`HSpacing(3), `CheckBox( `id(`home), `opt(`notify), // Label text _("Propose Separate &Home Partition"), GetProposalHome() )))); - vb = add( vb, `VSpacing(0.5) ); + vb = add( vb, `VSpacing(space) ); vb = add( vb, `Left(`HBox(`HSpacing(3), `CheckBox(`id(`btrfs), `opt(`notify), // Label text _("Use &Btrfs as default Filesystem"), GetProposalBtrfs() )))); - term frame = `VBox( `VSpacing(1.5), + term frame = `VBox( `VSpacing(3*space), `HVCenter( `VBox( `Left(`Label( `opt(`boldFont), _("Proposal settings"))), `VSpacing(0.3), `HVCenter(vb)) )); //`HVCenter(`Frame( _("Proposal settings"), `HVCenter(vb) ))); y2milestone( "AddCommonWidgets Home:%1 Btrfs:%2", GetProposalHome(), ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
