Imported Upstream version 17.25.4

[platform/upstream/libzypp.git] / zypp / ZYppFactory.cc

diff --git a/zypp/ZYppFactory.cc b/zypp/ZYppFactory.cc
index c1f0bca..0850b15 100644 (file)
--- a/zypp/ZYppFactory.cc
+++ b/zypp/ZYppFactory.cc
@@ -26,7 +26,6 @@ extern "C"
 
 #include <zypp/ZYppFactory.h>
 #include <zypp/zypp_detail/ZYppImpl.h>
-#include <zypp/zypp_detail/ZYppReadOnlyHack.h>
 
 #include <boost/interprocess/sync/file_lock.hpp>
 #include <boost/interprocess/sync/scoped_lock.hpp>
@@ -70,7 +69,7 @@ namespace zypp
 
     static bool active = getenv("ZYPP_READONLY_HACK");
 
-    void IWantIt()
+    void IWantIt()     // see zypp/zypp_detail/ZYppReadOnlyHack.h
     {
       active = true;
       MIL << "ZYPP_READONLY promised." <<  endl;
@@ -94,7 +93,7 @@ namespace zypp
   {
   public:
     ZYppGlobalLock()
-    : _zyppLockFilePath( env::ZYPP_LOCKFILE_ROOT() / "/var/run/zypp.pid" )
+    : _zyppLockFilePath( env::ZYPP_LOCKFILE_ROOT() / "/run/zypp.pid" )
     , _zyppLockFile( NULL )
     , _lockerPid( 0 )
     , _cleanLock( false )
@@ -114,7 +113,7 @@ namespace zypp
            // still use it to synchronsize.
            ftruncate( fileno(_zyppLockFile), 0 );
          }
-         MIL << "Cleanned lock file. (" << getpid() << ")" << std::endl;
+         MIL << "Cleaned lock file. (" << getpid() << ")" << std::endl;
        }
        catch(...) {} // let no exception escape.
     }