From: Michael Andres <ma@suse.de>
Date: Wed, 19 Sep 2007 12:23:17 +0000 (+0000)
Subject: Enable package cache during commit.
X-Git-Tag: 6.6.0~1592
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d83a7ef38ded25ac204b0c3b7e79836b05dd2cbf;p=platform%2Fupstream%2Flibzypp.git

Enable package cache during commit.
---

diff --git a/VERSION.cmake b/VERSION.cmake
index 28ba8c8ea..ddd0c65ca 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -47,4 +47,4 @@
 SET(LIBZYPP_MAJOR "3")
 SET(LIBZYPP_MINOR "24")
 SET(LIBZYPP_COMPATMINOR "24")
-SET(LIBZYPP_PATCH "2")
+SET(LIBZYPP_PATCH "3")
diff --git a/package/libzypp.changes b/package/libzypp.changes
index b0b49381c..eea848929 100644
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,9 +1,16 @@
+-------------------------------------------------------------------
+Wed Sep 19 14:19:49 CEST 2007 - ma@suse.de
+
+- Enable package cache during commit. (#326249)
+- version 3.24.2
+- revision 7309
+
 -------------------------------------------------------------------
 Tue Sep 18 14:01:02 CEST 2007 - schubi@suse.de
 
 - Do not regarding requirements for packages which will be deleted in the
   same solver run. Bug 310618
-- r 7292 
+- r 7292
 - version 3.24.2
 
 -------------------------------------------------------------------
diff --git a/zypp/target/CommitPackageCacheReadAhead.cc b/zypp/target/CommitPackageCacheReadAhead.cc
index 0e0b40060..b71820ccb 100644
--- a/zypp/target/CommitPackageCacheReadAhead.cc
+++ b/zypp/target/CommitPackageCacheReadAhead.cc
@@ -66,10 +66,10 @@ namespace zypp
     {
       if ( pi->mediaNr() == 0 ) // no media access at all
         return false;
-      //std::string scheme( pi->source().url().getScheme() );
-      //return ( scheme == "dvd" || scheme == "cd" );
-#warning "FIX CommitPackageCacheReadAhead::onInteractiveMedia"
-      return false;
+      if ( pi->repository().info().baseUrlsEmpty() )
+        return false; // no Url - should actually not happen
+      std::string scheme( pi->repository().info().baseUrlsBegin()->getScheme() );
+      return ( scheme == "dvd" || scheme == "cd" );
     }
 
     ///////////////////////////////////////////////////////////////////