Author: fehr Date: Tue Jan 24 13:36:33 2012 New Revision: 67252 URL: http://svn.opensuse.org/viewcvs/yast?rev=67252&view=rev Log: complete renaming of devs in Btrfs class (bnc#742491) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc?rev=67252&r1=67251&r2=67252&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc Tue Jan 24 13:36:33 2012 @@ -556,9 +556,15 @@ y2err("device " << old << " not fount"); } - list<string>::iterator i = find(dev_add.begin(), dev_add.end(), old); + list<string>::iterator i = find(devices.begin(), devices.end(), old); + if (i != devices.end()) + *i = nw; + i = find(dev_add.begin(), dev_add.end(), old); if (i != dev_add.end()) *i = nw; + i = find(dev_rem.begin(), dev_rem.end(), old); + if (i != dev_rem.end()) + *i = nw; } Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes?rev=67252&r1=67251&r2=67252&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Tue Jan 24 13:36:33 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 24 13:28:45 CET 2012 - fehr@suse.de + +- complete renaming of devs in Btrfs class (bnc#742491) + +------------------------------------------------------------------- Fri Jan 20 10:49:38 CET 2012 - aschnell@suse.de - fixed read-only mount of volumes for resize information detection @@ -13,8 +18,8 @@ Wed Jan 11 16:10:33 CET 2012 - fehr@suse.de - 2.17.124 -- fix bug when resizing a btrfs fs that had format set (bnc#732988) -- fix problem handling used by for btrfs during resize +- fix bug when extending a btrfs fs that had format set (bnc#732988) +- fix problem handling used by for btrfs during extend ------------------------------------------------------------------- Tue Jan 10 18:59:52 CET 2012 - fehr@suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org