Author: aschnell Date: Thu Oct 9 12:07:56 2008 New Revision: 52017 URL: http://svn.opensuse.org/viewcvs/yast?rev=52017&view=rev Log: - reactivated warning about unsupported filesystems (bnc #431232) Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_lib.ycp trunk/storage/storage/src/include/ep-dialogs.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=52017&r1=52016&r2=52017&view=diff ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Thu Oct 9 12:07:56 2008 @@ -1 +1 @@ -2.17.35 +2.17.36 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=52017&r1=52016&r2=52017&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Oct 9 12:07:56 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 09 12:06:47 CEST 2008 - aschnell@suse.de + +- reactivated warning about unsupported filesystems (bnc #431232) +- 2.17.36 + +------------------------------------------------------------------- Tue Oct 07 11:23:25 CEST 2008 - aschnell@suse.de - changed messages (bnc #429467) Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_lib.ycp?rev=52017&r1=52016&r2=52017&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Thu Oct 9 12:07:56 2008 @@ -783,7 +783,7 @@ if(mount == "swap") new["mount"] = ""; } - UI::ReplaceWidget(`id(`mount_dlg_rp), MountDlg( new, not_used_mp)); + // UI::ReplaceWidget(`id(`mount_dlg_rp), MountDlg( new, not_used_mp)); UI::ChangeWidget( `id(`mount_point), `Value, new["mount"]:"" ); UI::ChangeWidget( `id(`fstab_options), `Enabled, @@ -846,10 +846,9 @@ UI::ChangeWidget( `id(`fstab_options), `Enabled, size(mp)>0 ); } if( (init && UI::WidgetExists( `id(`format))) || - ret == `format_true || ret == `format_false) + ret == `do_format || ret == `do_not_format) { - boolean format = UI::QueryWidget(`id(`format), `CurrentButton) == - `format_true; + boolean format = UI::QueryWidget(`id(`format), `Value) == `do_format; boolean old_format = new["format"]:false; Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-dialogs.ycp?rev=52017&r1=52016&r2=52017&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Thu Oct 9 12:07:56 2008 @@ -39,7 +39,7 @@ //not much choice for swap partitions :) if( used_fs == `swap ) { - return fs_data[ `mountpoints ]:[]; + return fs_data[ `mountpoints ]:[]; } //otherwise, ask notUsedMountPoint, it will filter out //mountpoint already in use + add current mountpoint @@ -58,12 +58,12 @@ boolean do_mount = mount != ""; /* MiniWorkflowStepPartitionSize data: - $["create":true, - "cyl_size":8225280, - "device":"/dev/sda1", - "disk_device":"/dev/sda", - "new":true, - "slots":$[`primary:[1, 65]], + $["create":true, + "cyl_size":8225280, + "device":"/dev/sda1", + "disk_device":"/dev/sda", + "new":true, + "slots":$[`primary:[1, 65]], "type":`primary] */ @@ -95,7 +95,7 @@ term tmp1 = `Empty(); if (contains([`primary, `extended, `logical], data["type"]:`none)) { - tmp1 = `VBox(`id(`do_not_format_attachment), + tmp1 = `VBox(`id(`do_not_format_attachment), FsidComboBox(data, FileSystems::GetAllFileSystems(true, true)) ); } @@ -158,10 +158,17 @@ symbol widget = nil; + data = HandlePartWidgetChanges(true, widget, all_filesystems, orig_data, data); + repeat { widget = MiniWorkflow::UserInput(); + if (widget != `back && widget != `abort) + { + data = HandlePartWidgetChanges(false, widget, all_filesystems, orig_data, data); + } + switch (widget) { //user has chosen different filesystem @@ -446,7 +453,7 @@ integer total = 0; integer min_free = 5; - // Unit for partition resizing + // Unit for partition resizing string unit = _("MB"); integer factor = 1024*1024; @@ -460,8 +467,8 @@ void AdjustUnits ( map size_data ) { - //for partitions with free space less than ~10GB we'll - //keep using MBs to allow fine-grained + //for partitions with free space less than ~10GB we'll + //keep using MBs to allow fine-grained //size adjusting if( size_data["df_free"]:0 > 10*1024*factor ) { @@ -534,20 +541,20 @@ // Heading for dialog heading = sformat(_("Resize Partition %1"), device); - map size_data = $[]; + map size_data = $[]; if ( Partitions::IsSwapPartition( fsid ) ) { size_data = AdjustSwapPartitionDf( size_data ); } - else + else { size_data = Storage::GetFreeSpace( device, 0, used_fs, true); if (size( size_data ) == 0 || !size_data["ok"]:false) { - y2error("Failed to retrieve FreeSpace %1, filesystem %2", device, data["used_fs"]:`none); - //FIXME: Really? + y2error("Failed to retrieve FreeSpace %1, filesystem %2", device, data["used_fs"]:`none); + //FIXME: Really? Popup::Error( sformat( _("Partition %1 cannot be resized\nbecause the filesystem seems to be inconsistent"), device )); return false; } @@ -623,7 +630,7 @@ widget = UI::UserInput(); switch ( (symbol) widget) - { + { case `help: { Popup::LongText(_("Partition Resizing"), `RichText("To-Do: Let's get outta here"), 50, 20); @@ -651,7 +658,7 @@ y2milestone("ResizePartition - new size %1 %2, in cylinders %3", new_size, unit, diff); data["region"] = new_reg; - //1 - ask & be interactive, 2 - we are on lvm, 3 - cyl.diff, 4 - filesystem, 5 - mountpoint + //1 - ask & be interactive, 2 - we are on lvm, 3 - cyl.diff, 4 - filesystem, 5 - mountpoint if ( !CheckResizePossible( false, false, diff, used_fs, mountpoint )) { //FIXME: To check whether the part. can be resized only @@ -661,7 +668,7 @@ y2error("Resizing the partition is not possible"); widget = `again; } - else + else { //mark partition for resizing data["resize"] = true; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org