Imported Upstream version 1.11.53

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

diff --git a/VERSION.cmake b/VERSION.cmake
index 1100e88..3e6dde4 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -34,7 +34,7 @@
 #
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "11")
-SET(VERSION_PATCH "52")
+SET(VERSION_PATCH "53")
 
-# LAST RELEASED: 1.11.52
+# LAST RELEASED: 1.11.53
 #=======

diff --git a/package/zypper.changes b/package/zypper.changes
index ea670e5..a3a77c7 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Mar 14 11:12:35 CET 2016 - ma@suse.de
+
+- versioncmp: don't check for zypp lock (bsc#970575)
+- version 1.11.53
+
+-------------------------------------------------------------------
 Thu Mar  3 11:02:30 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 b30ea92..4549ca2 100644 (file)
--- a/src/Zypper.cc
+++ b/src/Zypper.cc
@@ -3113,12 +3113,13 @@ void Zypper::doCommand()
        if (roh != NULL && roh[0] == '1')
          zypp_readonly_hack::IWantIt ();
 
-       else if (   command() == ZypperCommand::LIST_REPOS
-         || command() == ZypperCommand::LIST_SERVICES
-         || command() == ZypperCommand::TARGET_OS )
+       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 = zypp::getZYpp();
+       God = zypp::getZYpp();
       }
       catch (ZYppFactoryException & excpt_r)
       {