Author: aschnell Date: Thu Aug 7 11:25:06 2008 New Revision: 49807 URL: http://svn.opensuse.org/viewcvs/yast?rev=49807&view=rev Log: - disable lock in testmode Modified: trunk/storage/libstorage/src/Lock.cc trunk/storage/libstorage/src/Lock.h trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/testsuite/lib/limal_init.exp Modified: trunk/storage/libstorage/src/Lock.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Lock.cc?rev=49807&r1=49806&r2=49807&view=diff ============================================================================== --- trunk/storage/libstorage/src/Lock.cc (original) +++ trunk/storage/libstorage/src/Lock.cc Thu Aug 7 11:25:06 2008 @@ -29,8 +29,8 @@ } - Lock::Lock(bool readonly) - : fd(-1), disabled(getenv("YAST2_STORAGE_NO_LOCKING") != NULL) + Lock::Lock(bool readonly, bool disable) + : fd(-1), disabled(disable || getenv("YAST2_STORAGE_NO_LOCKING") != NULL) { if (disabled) return; Modified: trunk/storage/libstorage/src/Lock.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Lock.h?rev=49807&r1=49806&r2=49807&view=diff ============================================================================== --- trunk/storage/libstorage/src/Lock.h (original) +++ trunk/storage/libstorage/src/Lock.h Thu Aug 7 11:25:06 2008 @@ -38,7 +38,7 @@ public: - Lock(bool readonly); + Lock(bool readonly, bool disable = false); ~Lock() throw(); private: Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=49807&r1=49806&r2=49807&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Thu Aug 7 11:25:06 2008 @@ -75,7 +75,7 @@ Storage::Storage( bool ronly, bool tmode, bool autodetec ) - : lock(ronly), readonly(ronly), testmode(tmode), initialized(false), + : lock(ronly, tmode), readonly(ronly), testmode(tmode), initialized(false), autodetect(autodetec) { y2milestone( "constructed Storage ronly:%d testmode:%d autodetect:%d", Modified: trunk/storage/libstorage/testsuite/lib/limal_init.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/lib/limal_init.exp?rev=49807&r1=49806&r2=49807&view=diff ============================================================================== --- trunk/storage/libstorage/testsuite/lib/limal_init.exp (original) +++ trunk/storage/libstorage/testsuite/lib/limal_init.exp Thu Aug 7 11:25:06 2008 @@ -40,8 +40,6 @@ # run the test - setenv YAST2_STORAGE_NO_LOCKING - set result "" set oops [catch { set result [exec $src >$outfile 2>$errfile] } catched] -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org