Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2012-11-14 09:17:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-09-23 08:46:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2012-11-14 09:17:16.000000000 +0100 @@ -1,0 +2,41 @@ +Tue Nov 13 13:20:59 CET 2012 - [email protected] + +- 2.23.1 +- removed boost-devel and openssl-devel from BuildRequires +- recognize "BIOS grub" partition as boot partition (bnc#786870) + +------------------------------------------------------------------- +Wed Nov 7 16:14:01 CET 2012 - [email protected] + +- support creation of "BIOS grub" partition on GPT (bnc#786870) + +------------------------------------------------------------------- +Mon Nov 5 13:42:32 CET 2012 - [email protected] + +- do a swapoff in live installer when swap partition gets removed + (bnc#779527) +- disable "Fstab Options" button when not fstab entry (bnc#786788) + +------------------------------------------------------------------- +Tue Oct 23 16:09:38 CEST 2012 - [email protected] + +- support key "mkfs_options" in volumes for autoyast + +------------------------------------------------------------------- +Tue Oct 16 15:00:38 CEST 2012 - [email protected] + +- make autoyast able to continue on commit errors (bnc#785234) + +------------------------------------------------------------------- +Fri Oct 12 16:55:53 CEST 2012 - [email protected] + +- mention in help text that read-only mount flag is ignored during + installation (bnc#771556) + +------------------------------------------------------------------- +Tue Sep 25 17:05:18 CEST 2012 - [email protected] + +- propose reuse (without format) an existing EFI boot partition + (bnc#781689) + +------------------------------------------------------------------- Old: ---- yast2-storage-2.23.0.tar.bz2 New: ---- yast2-storage-2.23.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.00dsNU/_old 2012-11-14 09:17:17.000000000 +0100 +++ /var/tmp/diff_new_pack.00dsNU/_new 2012-11-14 09:17:17.000000000 +0100 @@ -17,20 +17,18 @@ Name: yast2-storage -Version: 2.23.0 +Version: 2.23.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-storage-%{version}.tar.bz2 -BuildRequires: boost-devel BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen BuildRequires: gcc-c++ -BuildRequires: libstorage-devel >= 2.23.0 +BuildRequires: libstorage-devel >= 2.23.1 BuildRequires: libtool BuildRequires: libxslt -BuildRequires: openssl-devel BuildRequires: perl-XML-Writer BuildRequires: sablot BuildRequires: sgml-skel @@ -41,6 +39,7 @@ BuildRequires: yast2-devtools BuildRequires: yast2-perl-bindings BuildRequires: yast2-testsuite >= 2.19.0 +Requires: libstorage4 >= 2.23.1 Requires: perl = %{perl_version} Requires: yast2 >= 2.19.4 Requires: yast2-core >= 2.18.3 ++++++ yast2-storage-2.23.0.tar.bz2 -> yast2-storage-2.23.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.0/VERSION new/yast2-storage-2.23.1/VERSION --- old/yast2-storage-2.23.0/VERSION 2012-09-17 16:11:17.000000000 +0200 +++ new/yast2-storage-2.23.1/VERSION 2012-11-13 13:23:57.000000000 +0100 @@ -1 +1 @@ -2.23.0 +2.23.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.0/storage/src/include/custom_part_check_generated.ycp new/yast2-storage-2.23.1/storage/src/include/custom_part_check_generated.ycp --- old/yast2-storage-2.23.0/storage/src/include/custom_part_check_generated.ycp 2012-09-17 15:46:05.000000000 +0200 +++ new/yast2-storage-2.23.1/storage/src/include/custom_part_check_generated.ycp 2012-11-13 13:16:23.000000000 +0100 @@ -87,6 +87,7 @@ boolean root_lvm = false; symbol root_fs = `unknown; symbol boot_fs = `unknown; + integer boot_fsid = 0; integer boot_size_k = 0; boolean boot_size_check = !(Arch::board_chrp() || Arch::board_prep() || Arch::board_iseries() || Arch::board_mac()); boolean fat_system_mount = false; @@ -157,6 +158,7 @@ boot_end = Region::End(part["region"]:[]); boot_fs = part["used_fs"]:`unknown; boot_size_k = part["size_k"]:0; + boot_fsid = Partitions::fsid_prep_chrp_boot; } else if( Arch::board_mac() && part["used_fs"]:`unknown==`hfs ) { @@ -165,6 +167,14 @@ boot_fs = part["used_fs"]:`unknown; boot_size_k = part["size_k"]:0; } + else if( fsid == Partitions::fsid_bios_grub ) + { + boot_found = true; + boot_end = Region::End(part["region"]:[]); + boot_fs = `none; + boot_size_k = part["size_k"]:0; + boot_fsid = Partitions::fsid_bios_grub; + } } @@ -214,7 +224,7 @@ y2milestone("diskless:%1", diskless); y2milestone("root_found:%1 root_fs:%2", root_found, root_fs); - y2milestone("boot_found:%1 boot_fs:%2", boot_found, boot_fs); + y2milestone("boot_found:%1 boot_fs:%2 boot_fsid:%3", boot_found, boot_fs, boot_fsid); y2milestone("root_dmraid:%1 root_raid:%2 boot_raid:%3 raid_type:%4", root_dmraid, root_raid, boot_raid, raid_type); @@ -262,7 +272,8 @@ ok = false; } - if ((boot_found && contains([ `btrfs ], boot_fs)) || show_all_popups) + if( (boot_found && boot_fsid!=Partitions::fsid_bios_grub && contains([ `btrfs ], boot_fs)) || + show_all_popups) { // popup text string message = _("You have mounted a partition with Btrfs to the @@ -290,7 +301,7 @@ ok = false; } - if( (boot_found) && installation || show_all_popups ) + if( boot_found && installation || show_all_popups ) { if( boot_end >= Partitions::BootCyl() || show_all_popups ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.0/storage/src/include/custom_part_dialogs.ycp new/yast2-storage-2.23.1/storage/src/include/custom_part_dialogs.ycp --- old/yast2-storage-2.23.0/storage/src/include/custom_part_dialogs.ycp 2012-09-17 15:46:05.000000000 +0200 +++ new/yast2-storage-2.23.1/storage/src/include/custom_part_dialogs.ycp 2012-11-07 14:37:39.000000000 +0100 @@ -913,15 +913,15 @@ }); integer id = new_val["fsid"]:0; - if( id != 0 && !contains( added_fsids, id ) ) + if( id != 0 && id<=255 && !contains( added_fsids, id ) ) { string part_id = Partitions::ToHexString(id) + " " + Partitions::FsIdToString(id); items = add( items, `item( `id(part_id), part_id, true )); } - map<string,integer> so = $[ "0x83" : 0, "0x8" : 1, "0xF" : 2, "0x0" : 3, - "0x10" : 6 ]; + map<string,integer> so = $[ "0x83" : 0, "0x8" : 1, "0xF" : 2, "0x00" : 7, + "0x10" : 6, "0x0" : 3 ]; map<string,integer> val = $[]; foreach( term t, items, ``{val[t[1]:""] = 5;} ); foreach( string s, integer i, val, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.0/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.23.1/storage/src/include/custom_part_lib.ycp --- old/yast2-storage-2.23.0/storage/src/include/custom_part_lib.ycp 2012-09-17 15:46:05.000000000 +0200 +++ new/yast2-storage-2.23.1/storage/src/include/custom_part_lib.ycp 2012-11-07 16:12:08.000000000 +0100 @@ -550,9 +550,9 @@ } // 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, - size(new["mount"]:"")>0 ); + if( !init ) + UI::ChangeWidget( `id(`fstab_options), `Enabled, + size(new["mount"]:"")>0 ); if( UI::WidgetExists( `id(`fs_options) )) UI::ChangeWidget(`id(`fs_options), `Enabled, new["format"]:false && selected_fs[`options]:[]!=[] ); @@ -599,6 +599,8 @@ init, ret, new ); symbol used_fs = new["used_fs"]:`unknown; map selected_fs = file_systems[used_fs]:$[]; + if( init && !isempty(old["mount"]:"") && old["ignore_fstab"]:false ) + UI::ChangeWidget( `id(`fstab_options), `Enabled, false); ///////////////////////////////////////////////////////// // configure main dialog and modify map new if( !init && new["mount"]:"" != old["mount"]:"" ) @@ -738,40 +740,29 @@ { //////////////////////////////////////////////// // modify map new - string fs_string = String::CutBlanks((string) UI::QueryWidget(`id(`fsid_point), `Value)); + string fs_string = (string) UI::QueryWidget(`id(`fsid_point), `Value); y2milestone("HandlePartWidgetChanges fs_string:%1", fs_string ); - - integer pos = search(fs_string, " "); - if (pos != nil) - fs_string = substring(fs_string, 0, pos); - - integer fs_int = tointeger(fs_string); - if (!isempty(fs_string) && fs_int == nil) - { - // error popup text - Popup::Error(_("Illegal file system ID.")); - } - + integer fs_int = FileSystems::FindFsid(fs_string); 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, Partitions::fsid_raid, Partitions::fsid_hibernation, + Partitions::fsid_bios_grub, Partitions::fsid_prep_chrp_boot ], fs_int ); UI::ChangeWidget( `id(`fstab_options), `Enabled, !no_fs ); UI::ChangeWidget( `id(`do_format), `Enabled, !no_fs ); UI::ChangeWidget(`id(`do_mount_attachment), `Enabled, !no_fs); + UI::ChangeWidget(`id(`mount), `Enabled, !no_fs); if( no_fs ) { UI::ChangeWidget( `id(`do_not_mount), `Value, true); - ChangeExistingSymbolsState( [ `fs_options, `fs ], false ); + ChangeExistingSymbolsState( [ `fs_options, `fs, `crypt_fs ], false ); } else if( fs_int == Partitions::fsid_native ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.0/storage/src/include/ep-dialogs.ycp new/yast2-storage-2.23.1/storage/src/include/ep-dialogs.ycp --- old/yast2-storage-2.23.0/storage/src/include/ep-dialogs.ycp 2012-09-17 15:46:05.000000000 +0200 +++ new/yast2-storage-2.23.1/storage/src/include/ep-dialogs.ycp 2012-11-07 16:06:01.000000000 +0100 @@ -58,10 +58,12 @@ symbol MiniWorkflowStepFormatMount(map<string, any> &orig_data) { map<string, any> data = orig_data; - y2milestone("MiniWorkflowStepFormatMount data:%1", data); + map d = Storage::GetDiskPartition(data["device"]:""); + string lbl = Storage::GetTargetMap()[d["disk"]:"","label"]:""; + y2milestone("MiniWorkflowStepFormatMount label:%1 data:%2", lbl, data); //retrieve all filesystems - map<symbol, map<symbol, any> > all_filesystems = FileSystems::GetAllFileSystems(true, true); + map<symbol, map<symbol, any> > all_filesystems = FileSystems::GetAllFileSystems(true, true,lbl); if( data["type"]:`primary==`btrfs ) { // multi volume btrfs filesystem can only be formatted as btrfs @@ -170,7 +172,7 @@ if (contains([`primary, `extended, `logical], data["type"]:`none)) { tmp1 = `VBox(`id(`do_not_format_attachment), - FsidComboBox(data, FileSystems::GetAllFileSystems(true, true)) + FsidComboBox(data, FileSystems::GetAllFileSystems(true, true,lbl)) ); } @@ -309,7 +311,7 @@ if (size(fs_options) > 0 && !haskey(data, "fs_options")) data["fs_options"] = FileSystems::DefaultFormatOptions(data); - map filesystems = FileSystems::GetAllFileSystems(true, true); + map filesystems = FileSystems::GetAllFileSystems(true, true,lbl); data["fs_options"] = FileSystemOptions(data["fs_options"]:$[], filesystems[data["used_fs"]:`unknown]:$[]); break; */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.0/storage/src/modules/FileSystems.ycp new/yast2-storage-2.23.1/storage/src/modules/FileSystems.ycp --- old/yast2-storage-2.23.0/storage/src/modules/FileSystems.ycp 2012-09-17 15:46:05.000000000 +0200 +++ new/yast2-storage-2.23.1/storage/src/modules/FileSystems.ycp 2012-11-07 16:02:12.000000000 +0100 @@ -223,8 +223,8 @@ `query_key : "opt_readonly", // help text, richtext format `help_text : _("<p><b>Mount Read-Only:</b> -Writing to the file system is not possible. Default is false.</p> -"), +Writing to the file system is not possible. Default is false. During installation +the file system is always mounted read-write.</p>"), `type : `boolean, `str_opt : $[ 1 : "ro", "default" : "" ], `str_scan : [[ "ro", 1 ], ["rw", 0 ]], @@ -945,11 +945,18 @@ `supports_format : false, `fsid_item : "0xA0 Hibernation" ], + `xxbios : $[ + `name : "BIOS Grub", + `fsid : Partitions::fsid_bios_grub, + `supports_format : false, + `label : "gpt", + `fsid_item : "0x00 BIOS Grub" + ], `xxefi : $[ `name : "Efi Boot", `fsid : Partitions::fsid_gpt_boot, `supports_format : false, - `fsid_item : "0x103 EFI Boot" + `fsid_item : "0x00 EFI Boot" ] ]; @@ -958,7 +965,7 @@ * Filesystem Definitions * @return map map with all supported filesystems */ -global define map<symbol, map<symbol, any> > GetAllFileSystems(boolean add_swap, boolean add_pseudo ) +global define map<symbol, map<symbol, any> > GetAllFileSystems(boolean add_swap, boolean add_pseudo, string label ) ``{ map<symbol, map<symbol, any> > ret = filter( symbol fs_key, map<symbol,any> fs_map, GetNormalFilesystems(), ``( support[fs_key]:false )); @@ -969,8 +976,11 @@ } if( add_pseudo ) { - ret = (map<symbol, map<symbol, any> >)union( ret, filter( symbol fs_key, any fs_map, PseudoFileSystems, - ``( support[fs_key]:false ))); + ret = (map<symbol, map<symbol, any> >)union( ret, filter( symbol fs_key, map fs_map, PseudoFileSystems, + ``( support[fs_key]:false|| + (!isempty(fs_map[`label]:"")&& + fs_map[`label]:""==label) + ))); } return ret; } @@ -989,7 +999,7 @@ ret = tmpfs_fst_options; else { - map<symbol, map<symbol, any> > fs = GetAllFileSystems( true, false ); + map<symbol, map<symbol, any> > fs = GetAllFileSystems( true, false, "" ); ret = fs[fsys,`fst_options]:[]; if( contains( [`ext3, `ext4, `reiser], fsys ) ) { @@ -1004,8 +1014,21 @@ return ret; }; +global integer FindFsid( string fs_item ) + { + integer ret = nil; + map<symbol, map> fs = (map<symbol,map>)union( GetNormalFilesystems(), SwapFileSystems ); + fs = (map<symbol,map>)union( fs, PseudoFileSystems ); + list l = maplist( symbol ss, map mm, filter( symbol s, map m, fs, + ``(m[`fsid_item]:""==fs_item)), + ``(mm[`fsid]:nil)); + if( !isempty(l) ) + ret = l[0]:0; + y2milestone( "FindFsid item:%1 ret:%2", fs_item, ret ); + return( ret ); + } - global void FileSystems() +global void FileSystems() { if( Arch::sparc64() || Arch::sparc32() ) { @@ -1079,7 +1102,7 @@ global define map<symbol, any> GetFsMap( symbol used_fs ) ``{ - map<symbol, map<symbol, any> > allfs = GetAllFileSystems( true, true ); + map<symbol, map<symbol, any> > allfs = GetAllFileSystems( true, true, "" ); if( haskey( allfs, used_fs )) return allfs[ used_fs]:$[]; else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.0/storage/src/modules/Partitions.ycp new/yast2-storage-2.23.1/storage/src/modules/Partitions.ycp --- old/yast2-storage-2.23.0/storage/src/modules/Partitions.ycp 2012-09-17 15:46:05.000000000 +0200 +++ new/yast2-storage-2.23.1/storage/src/modules/Partitions.ycp 2012-11-05 18:41:35.000000000 +0100 @@ -62,6 +62,7 @@ global const integer fsid_gpt_boot = 0x103; global const integer fsid_gpt_service = 0x104; global const integer fsid_gpt_msftres = 0x105; + global const integer fsid_bios_grub = 0x107; global const integer fsid_freebsd = 0xa5; global const integer fsid_openbsd = 0xa6; global const integer fsid_netbsd = 0xa9; @@ -733,6 +734,7 @@ case 0x104: return "Service"; case 0x105: return "Microsoft reserved"; case 0x106: return "Apple_UFS"; + case 0x107: return "BIOS Grub"; default: return "unknown"; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.0/storage/src/modules/Storage.ycp new/yast2-storage-2.23.1/storage/src/modules/Storage.ycp --- old/yast2-storage-2.23.0/storage/src/modules/Storage.ycp 2012-09-17 15:46:05.000000000 +0200 +++ new/yast2-storage-2.23.1/storage/src/modules/Storage.ycp 2012-11-05 16:36:20.000000000 +0100 @@ -1354,6 +1354,9 @@ tbool = LibStorage::VolumeInfo::swig_ignore_fs_get(vinfo); if( tbool ) p["ignore_fs"] = true; + tbool = LibStorage::VolumeInfo::swig_ignore_fstab_get(vinfo); + if( tbool ) + p["ignore_fstab"] = true; tmp = LibStorage::VolumeInfo::swig_loop_get(vinfo); if( size(tmp)>0 ) p["loop"] = tmp; @@ -2625,6 +2628,18 @@ else y2milestone( "ChangeVolumeProperties sint ret:%1", ret ); } + if( ret==0 && part["format"]:false && !isempty(part["mkfs_options"]:"") && + part["mkfs_options"]:"" != curr["mkfs_opt"]:"" ) + { + changed = true; + ts = part["mkfs_options"]:""; + y2milestone( "FsOption ts:%1", ts ); + ret = LibStorage::StorageInterface::changeMkfsOptVolume( sint, dev, ts ); + if( ret<0 ) + y2error( "ChangeVolumeProperties sint ret:%1", ret ); + else + y2milestone( "ChangeVolumeProperties sint ret:%1", ret ); + } if( ret==0 && part["format"]:false && convertFsOptionMapToString(part["fs_options"]:$[], `tunefs) != curr["tunefs_opt"]:"" ) { @@ -4494,6 +4509,13 @@ } } if( ret["format"]:false && !ret["create"]:false && + ret["detected_fs"]:`unknown == `vfat && + ret["fsid"]:0==Partitions::fsid_gpt_boot && + mnt==Partitions::BootMount() ) + { + ret["format"] = false; + } + if( ret["format"]:false && !ret["create"]:false && ret["detected_fs"]:`unknown == `swap && mnt=="swap" ) { ret["format"] = false; @@ -4545,6 +4567,17 @@ return( ret ); } +boolean TryUnaccessSwap( string device ) + { + boolean ret = isempty(DeviceMounted(device)); + if( !ret && Mode::live_installation() ) + { + ret = Umount( device ); + } + y2milestone( "TryUnaccessSwap device %1 ret:%2", device, ret ); + return(ret); + } + global boolean CanEdit( map p, boolean verbose ) { boolean ret = true; @@ -4554,8 +4587,10 @@ p["mount"]:""=="swap" ) { ret = false; - y2milestone( "CanEdit p:%1", p ); if( verbose ) + ret = TryUnaccessSwap( p["device"]:"" ); + y2milestone( "CanEdit ret:%1 p:%2", ret, p ); + if( verbose && !ret ) { string txt = sformat( _(" Device %1 cannot be modified because it contains activated swap @@ -4586,6 +4621,8 @@ { string txt = ""; boolean ret = CanEdit( p, false ); + if( !ret && verbose && p["mount"]:""=="swap" ) + ret = TryUnaccessSwap( p["device"]:"" ); if( !ret && verbose ) { if( p["mount"]:""=="swap" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.0/storage/src/modules/StorageClients.ycp new/yast2-storage-2.23.1/storage/src/modules/StorageClients.ycp --- old/yast2-storage-2.23.0/storage/src/modules/StorageClients.ycp 2012-09-17 15:46:05.000000000 +0200 +++ new/yast2-storage-2.23.1/storage/src/modules/StorageClients.ycp 2012-10-16 15:08:20.000000000 +0200 @@ -31,6 +31,7 @@ module "StorageClients"; import "Label"; + import "Mode"; import "Popup"; import "Report"; import "SlideShow"; @@ -105,38 +106,48 @@ } - global boolean CommitErrorPopup(integer error, string last_action, string extended_message) +global boolean CommitErrorPopup(integer error, string last_action, string extended_message) { - y2milestone("CommitErrorPopup error:%1 last_action:%2 extended_message:%3", - error, last_action, extended_message); + y2milestone("CommitErrorPopup error:%1 last_action:%2 extended_message:%3", + error, last_action, extended_message); - list<string> tmp1 = splitstring(extended_message, "\n"); - if (size(tmp1) > 5) + list<string> tmp1 = splitstring(extended_message, "\n"); + if (size(tmp1) > 5) { - tmp1 = sublist(tmp1, 0, 5); - tmp1 = tmp1 + "..."; + tmp1 = sublist(tmp1, 0, 5); + tmp1 = tmp1 + "..."; } - extended_message = mergestring(tmp1, "\n"); + extended_message = mergestring(tmp1, "\n"); - string text = _("Failure occurred during the following action:") + "\n" + last_action + "\n\n"; + string text = _("Failure occurred during the following action:") + "\n" + last_action + "\n\n"; - string tmp = LibStorage::StorageInterface::getErrorString(sint, error); - if (!isempty(tmp)) + string tmp = LibStorage::StorageInterface::getErrorString(sint, error); + if (!isempty(tmp)) { - text = text + tmp + "\n\n"; + text = text + tmp + "\n\n"; } - text = text + sformat(_("System error code was: %1"), error) + "\n\n"; + text = text + sformat(_("System error code was: %1"), error) + "\n\n"; - if (!isempty(extended_message)) + if (!isempty(extended_message)) { - text = text + extended_message + "\n\n"; + text = text + extended_message + "\n\n"; } - text = text + _("Continue despite the error?"); + text = text + _("Continue despite the error?"); - return Report::ErrorAnyQuestion(Popup::NoHeadline(), text, Label::ContinueButton(), - Label::AbortButton(), `focus_no); + boolean ret = Report::ErrorAnyQuestion(Popup::NoHeadline(), text, + Label::ContinueButton(), + Label::AbortButton(), `focus_no); + if( Mode::autoinst() ) + { + map ex = Report::Export(); + if( ex["yesno_messages","show"]:true==false || + ex["yesno_messages","timeout"]:0>0 ) + ret = true; + } + y2milestone( "CommitErrorPopup ret:%1", ret ); + return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.0/storage/src/modules/StorageProposal.ycp new/yast2-storage-2.23.1/storage/src/modules/StorageProposal.ycp --- old/yast2-storage-2.23.0/storage/src/modules/StorageProposal.ycp 2012-09-20 15:55:48.000000000 +0200 +++ new/yast2-storage-2.23.1/storage/src/modules/StorageProposal.ycp 2012-11-12 12:18:55.000000000 +0100 @@ -383,7 +383,8 @@ { ret = true; } - if( !ret && soft && NeedNewDisklabel(entry) ) + if( !ret && soft && NeedNewDisklabel(entry) && + !isempty(filter(map p, entry["partitions"]:[], ``(!p["delete"]:false)))) { ret = true; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
