Imported Upstream version 1.12.37

Change-Id: I366e1f878fecf9d0a2ed5f16d4976290d3b87a5a
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/VERSION.cmake b/VERSION.cmake
index 13079a4..a61e944 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -34,7 +34,7 @@
 #
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "12")
-SET(VERSION_PATCH "36")
+SET(VERSION_PATCH "37")
 
-# LAST RELEASED: 1.12.36
+# LAST RELEASED: 1.12.37
 #=======

diff --git a/package/zypper.changes b/package/zypper.changes
index 7af2862..740241f 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Mar 14 11:13:17 CET 2016 - ma@suse.de
+
+- versioncmp: don't check for zypp lock (bsc#970575)
+- version 1.12.37
+
+-------------------------------------------------------------------
 Wed Mar  9 15:19:05 CET 2016 - ma@suse.de
 
 - man: Rephrase unclear explanation of --non-interactive (bsc#969186)

diff --git a/src/Zypper.cc b/src/Zypper.cc
index c7f1bd3..9d96384 100644 (file)
--- a/src/Zypper.cc
+++ b/src/Zypper.cc
@@ -3128,9 +3128,11 @@ void Zypper::doCommand()
 
        else if ( command() == ZypperCommand::LIST_REPOS
               || command() == ZypperCommand::LIST_SERVICES
+              || command() == ZypperCommand::VERSION_CMP
               || command() == ZypperCommand::TARGET_OS )
          zypp_readonly_hack::IWantIt (); // #247001, #302152
-         God = getZYpp();      // lock again?
+
+       God = getZYpp();        // lock again?
       }
       catch ( ZYppFactoryException & excpt_r )
       {