Imported Upstream version 14.38.1

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

diff --git a/VERSION.cmake b/VERSION.cmake
index 61880ad..87b442f 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "14")
 SET(LIBZYPP_COMPATMINOR "30")
 SET(LIBZYPP_MINOR "38")
-SET(LIBZYPP_PATCH "0")
+SET(LIBZYPP_PATCH "1")
 #
-# LAST RELEASED: 14.38.0 (30)
+# LAST RELEASED: 14.38.1 (30)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index e52b181..6a739a0 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Thu Apr  2 16:01:43 CEST 2015 - ma@suse.de
+
+- Fixes to build with gcc5
+- RepoProvideFile: Suppress MediaChangeReport while testing
+  multiple baseurls (bnc#899510)
+- version 14.38.1 (30)
+
+-------------------------------------------------------------------
 Thu Mar 19 16:44:39 CET 2015 - ma@suse.de
 
 - Suppress MediaChangeReport while testing multiple baseurls (bnc#899510)

diff --git a/zypp/repo/RepoProvideFile.cc b/zypp/repo/RepoProvideFile.cc
index 5ac2815..4b06f71 100644 (file)
--- a/zypp/repo/RepoProvideFile.cc
+++ b/zypp/repo/RepoProvideFile.cc
@@ -291,6 +291,9 @@ namespace zypp
         MIL << "Added cache path " << destinationDir << endl;
       }
 
+      // Suppress (interactive) media::MediaChangeReport if we in have multiple basurls (>1)
+      media::ScopedDisableMediaChangeReport guard( repo_r.baseUrlsSize() > 1 );
+
       for ( RepoInfo::urls_const_iterator it = repo_r.baseUrlsBegin();
             it != repo_r.baseUrlsEnd();
             /* incremented in the loop */ )

diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index 89506ed..edd1055 100644 (file)
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -1059,7 +1059,7 @@ namespace zypp
 
         cmd << "  > '" << tmpsolv.path() << "'";
 
-        MIL << "Executing: " << cmd << endl;
+        MIL << "Executing: " << cmd.str() << endl;
         ExternalProgram prog( cmd.str(), ExternalProgram::Stderr_To_Stdout );
 
         cmd << endl;

diff --git a/zypp/ui/SelectableTraits.h b/zypp/ui/SelectableTraits.h
index 9ad8102..5014dbf 100644 (file)
--- a/zypp/ui/SelectableTraits.h
+++ b/zypp/ui/SelectableTraits.h
@@ -37,6 +37,7 @@ namespace zypp
        * \li repository priority
        * \li best Arch (arch/noarch changes are ok)
        * \li best Edition
+       * \li newer buildtime
        * \li ResObject::constPtr as fallback.
       */
       struct AVOrder : public std::binary_function<PoolItem,PoolItem,bool>
@@ -65,6 +66,11 @@ namespace zypp
           if ( res )
             return res > 0;
 
+         lprio = lhs->buildtime();
+         rprio = rhs->buildtime();
+         if ( lprio != rprio )
+            return( lprio > rprio );
+
           lprio = lhs->satSolvable().repository().satInternalSubPriority();
           rprio = rhs->satSolvable().repository().satInternalSubPriority();
           if ( lprio != rprio )