Author: aschnell Date: Mon Oct 13 11:08:09 2008 New Revision: 52097 URL: http://svn.opensuse.org/viewcvs/yast?rev=52097&view=rev Log: - do not display filesystem and mount options dialog twice Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-dialogs.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=52097&r1=52096&r2=52097&view=diff ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Mon Oct 13 11:08:09 2008 @@ -1 +1 @@ -2.17.36 +2.17.37 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=52097&r1=52096&r2=52097&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Oct 13 11:08:09 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 13 11:06:58 CEST 2008 - aschnell@suse.de + +- do not display filesystem and mount options dialog twice +- 2.17.37 + +------------------------------------------------------------------- Thu Oct 09 12:06:47 CEST 2008 - aschnell@suse.de - reactivated warning about unsupported filesystems (bnc #431232) 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=52097&r1=52096&r2=52097&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Mon Oct 13 11:08:09 2008 @@ -203,6 +203,7 @@ MiniWorkflow::SetLastStep(UI::QueryWidget(`id(`crypt_fs), `Value) != true); break; + /* already done in HandlePartWidgetChanges case `fs_options: map fs_options = FileSystems::DefaultFormatOptions(data); if (size(fs_options) > 0 && !haskey(data, "fs_options")) @@ -211,7 +212,9 @@ map filesystems = FileSystems::GetAllFileSystems(true, true); data["fs_options"] = FileSystemOptions(data["fs_options"]:$[], filesystems[data["used_fs"]:`unknown]:$[]); break; + */ + /* already done in HandlePartWidgetChanges case `fstab_options: string fstopt = FileSystems::DefaultFstabOptions(data); if (size(fstopt) > 0 && !haskey(data, "fstopt")) @@ -219,6 +222,7 @@ data = FstabOptions(data, data); break; + */ case `do_format: // TODO -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org