Author: locilka Date: Mon Aug 27 14:21:11 2007 New Revision: 40499 URL: http://svn.opensuse.org/viewcvs/yast?rev=40499&view=rev Log: - Calling Storage::DeviceMatchFstab with not-translated device name instead of the translated one (Storage::GetTranslatedDevices) (#304269). - 2.15.22 Modified: trunk/update/VERSION trunk/update/package/yast2-update.changes trunk/update/src/modules/RootPart.ycp Modified: trunk/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=40499&r1=40498&r2=40499&view=diff ============================================================================== --- trunk/update/VERSION (original) +++ trunk/update/VERSION Mon Aug 27 14:21:11 2007 @@ -1 +1 @@ -2.15.21 +2.15.22 Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.changes?rev=40499&r1=40498&r2=40499&view=diff ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Mon Aug 27 14:21:11 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Aug 27 14:18:25 CEST 2007 - locilka@suse.cz + +- Calling Storage::DeviceMatchFstab with not-translated device name + instead of the translated one (Storage::GetTranslatedDevices) + (#304269). +- 2.15.22 + +------------------------------------------------------------------- Thu Aug 23 15:22:12 CEST 2007 - locilka@suse.cz - Preselecting new kernel if recommended and installed kernels do Modified: trunk/update/src/modules/RootPart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/RootPart.ycp?rev=40499&r1=40498&r2=40499&view=diff ============================================================================== --- trunk/update/src/modules/RootPart.ycp (original) +++ trunk/update/src/modules/RootPart.ycp Mon Aug 27 14:21:11 2007 @@ -596,11 +596,12 @@ * * @param list <map> of definitions to translate * @param string key name in map to translate + * @param string key name in map to keep the old value * @return list <map> of translated definitions * * @see https://bugzilla.novell.com/show_bug.cgi?id=258222 */ - define list <map> TranslateFsOrCryptoTab (list <map> translate, string key_to_translate) { + define list <map> TranslateFsOrCryptoTab (list <map> translate, string key_to_translate, string key_preserve_as) { // Check whether there is any hardware information that could be used string check_command = sformat ("/usr/bin/find '%1/var/lib/hardware/'", String::Quote (Installation::destdir)); map cmd = (map) SCR::Execute (.target.bash_output, check_command); @@ -634,7 +635,8 @@ string new_val = new_names[i]:default_val; translate[i, key_to_translate] = new_val; - backward_translation[new_val] = default_val; + translate[i, key_preserve_as] = default_val; + backward_translation[new_val] = default_val; i = i + 1; }; @@ -747,11 +749,11 @@ Update::GetProductName(); y2milestone ("fstab: %1", fstab); - fstab = TranslateFsOrCryptoTab (fstab, "spec"); + fstab = TranslateFsOrCryptoTab (fstab, "spec", "spec_old"); y2milestone ("fstab: (translated) %1", fstab); y2milestone ("crtab: %1", crtab); - crtab = TranslateFsOrCryptoTab (crtab, "file"); + crtab = TranslateFsOrCryptoTab (crtab, "file", "file_old"); y2milestone ("crtab: (translated) %1", crtab); return true; @@ -1373,7 +1375,9 @@ boolean ok = size(fstab[0,"spec"]:"")>0 && Storage::DeviceMatchFstab( p_dev, - fstab[0,"spec"]:"" ); + // bugzilla #304269 + // DeviceMatchFstab expects _old_ not _translated_ device + fstab[0,"spec_old"]:fstab[0,"spec"]:"" ); // Why this doesn't match? // Possible reasons: -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org