ref: refs/heads/master
commit 64f8f52a51f9f9fedba60e1348c4805393d1dd20
Author: Michael Andres
Date: Wed Jun 17 14:18:31 2009 +0200
Remove obsolete DISABLE_AUTOMOUNTER code.
---
zypp/media/MediaManager.cc | 149 +-------------------------------------------
1 files changed, 1 insertions(+), 148 deletions(-)
diff --git a/zypp/media/MediaManager.cc b/zypp/media/MediaManager.cc
index 535110b..fa8a884 100644
--- a/zypp/media/MediaManager.cc
+++ b/zypp/media/MediaManager.cc
@@ -20,16 +20,12 @@
#include "zypp/media/Mount.h"
#include "zypp/thread/Mutex.h"
#include "zypp/thread/MutexLock.h"
-#include "zypp/target/hal/HalContext.h"
#include "zypp/base/String.h"
#include "zypp/base/Logger.h"
#include "zypp/Pathname.h"
#include "zypp/PathInfo.h"
-#define DISABLE_AUTOMOUNTER 0
-
-
//////////////////////////////////////////////////////////////////////
namespace zypp
{ ////////////////////////////////////////////////////////////////////
@@ -126,142 +122,6 @@ namespace zypp
// -------------------------------------------------------------
typedef std::map ManagedMediaMap;
-
- // -------------------------------------------------------------
- enum AutoMounterCleanUp
- {
- NONE, ENABLE, REMOVE
- };
-
- #define HAL_AUTOMOUNTER_UDI "/org/freedesktop/Hal/devices/computer"
- #define HAL_AUTOMOUNTER_KEY "storage.disable_volume_handling"
-
- // -------------------------------------------------------------
- AutoMounterCleanUp
- disableAutoMounter()
- {
- using namespace zypp::target::hal;
-
- AutoMounterCleanUp cleanup(NONE);
-#if DISABLE_AUTOMOUNTER
- try
- {
- HalContext hal(true);
- bool disabled(false);
-
- // query
- XXX << "Checking HAL volume handling property"
- << std::endl;
- try
- {
- disabled = hal.getDevicePropertyBool(
- HAL_AUTOMOUNTER_UDI, HAL_AUTOMOUNTER_KEY
- );
-
- if( disabled)
- {
- MIL << "HAL volume handling is already disabled"
- << std::endl;
- }
- else
- {
- cleanup = ENABLE;
- XXX << "HAL volume handling is enabled"
- << std::endl;
- }
- }
- catch(const HalException &e)
- {
- ZYPP_CAUGHT(e);
- XXX << "HAL volume handling is enabled (no property)"
- << std::endl;
- disabled = false;
- cleanup = REMOVE;
- }
-
- // disable
- if( !disabled)
- {
- XXX << "Trying to disable HAL volume handling"
- << std::endl;
- try
- {
- hal.setDevicePropertyBool(
- HAL_AUTOMOUNTER_UDI, HAL_AUTOMOUNTER_KEY,
- true
- );
-
- MIL << "Disabled HAL volume handling (automounter)"
- << std::endl;
- }
- catch(const HalException &e)
- {
- ZYPP_CAUGHT(e);
- WAR << "Unable to disable HAL volume handling (automounter)"
- << std::endl;
-
- cleanup = NONE;
- }
- }
- }
- catch(const HalException &e)
- {
- ZYPP_CAUGHT(e);
- WAR << "Unable to disable HAL volume handling (automounter)"
- << std::endl;
- }
-#endif // DISABLE_AUTOMOUNTER
- return cleanup;
- }
-
- // -------------------------------------------------------------
- void
- restoreAutoMounter(AutoMounterCleanUp cleanup)
- {
- using namespace zypp::target::hal;
-
- if(cleanup == NONE)
- return;
-
-#if DISABLE_AUTOMOUNTER
- try
- {
- HalContext hal(true);
-
- if(cleanup == ENABLE)
- {
- XXX << "Trying to restore HAL volume handling -- enable"
- << std::endl;
-
- hal.setDevicePropertyBool(
- HAL_AUTOMOUNTER_UDI, HAL_AUTOMOUNTER_KEY,
- false
- );
- }
- else
- if(cleanup == REMOVE)
- {
- XXX << "Trying to restore HAL volume handling -- remove"
- << std::endl;
-
- hal.removeDeviceProperty(
- HAL_AUTOMOUNTER_UDI, HAL_AUTOMOUNTER_KEY
- );
- }
-
- cleanup = NONE;
- MIL << "Restored HAL volume handling (automounter)"
- << std::endl;
- }
- catch(const HalException &e)
- {
- ZYPP_CAUGHT(e);
- WAR << "Unable to restore HAL volume handling (automounter)"
- << std::endl;
- }
-#endif // DISABLE_AUTOMOUNTER
- }
-
////////////////////////////////////////////////////////////////
} // anonymous
//////////////////////////////////////////////////////////////////
@@ -290,15 +150,11 @@ namespace zypp
friend class MediaManager;
MediaAccessId last_accessid;
- AutoMounterCleanUp am_cleanup;
ManagedMediaMap mediaMap;
MediaManager_Impl()
: last_accessid(0)
- {
- // disable automounter
- am_cleanup = disableAutoMounter();
- }
+ {}
public:
~MediaManager_Impl()
@@ -330,9 +186,6 @@ namespace zypp
// remove all other handlers
mediaMap.clear();
-
- // restore automounter state
- restoreAutoMounter(am_cleanup);
}
catch( ... )
{}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
Michael Andres