Enable package cache during commit.

diff --git a/VERSION.cmake b/VERSION.cmake
index 28ba8c8ea07858baae9f321a88b1af515f2fd837..ddd0c65ca7be470edbab42e065acf5f5f1f9404a 100644 (file)
--- 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 b0b49381ccc1a9199536428eab144a7ab9de5a9a..eea8489290deab01426c5cc4a28bb48986c696ab 100644 (file)
--- 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 0e0b400606c55bc1072e09398b4079070cd62bb5..b71820ccbc53b8393cc2a1b973770c75b10a0472 100644 (file)
--- 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" );
     }
 
     ///////////////////////////////////////////////////////////////////