Mailinglist Archive: zypp-commit (325 mails)

< Previous Next >
[zypp-commit] r7309 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes zypp/target/CommitPackageCacheReadAhead.cc
  • From: mlandres@xxxxxxxxxxxxxxxx
  • Date: Wed, 19 Sep 2007 12:23:17 -0000
  • Message-id: <20070919122317.74113175B7@xxxxxxxxxxxxxxxx>
Author: mlandres
Date: Wed Sep 19 14:23:17 2007
New Revision: 7309

URL: http://svn.opensuse.org/viewcvs/zypp?rev=7309&view=rev
Log:
Enable package cache during commit.

Modified:
    trunk/libzypp/VERSION.cmake
    trunk/libzypp/package/libzypp.changes
    trunk/libzypp/zypp/target/CommitPackageCacheReadAhead.cc

Modified: trunk/libzypp/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7309&r1=7308&r2=7309&view=diff
==============================================================================
--- trunk/libzypp/VERSION.cmake (original)
+++ trunk/libzypp/VERSION.cmake Wed Sep 19 14:23:17 2007
@@ -47,4 +47,4 @@
 SET(LIBZYPP_MAJOR "3")
 SET(LIBZYPP_MINOR "24")
 SET(LIBZYPP_COMPATMINOR "24")
-SET(LIBZYPP_PATCH "2")
+SET(LIBZYPP_PATCH "3")

Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=7309&r1=7308&r2=7309&view=diff
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Wed Sep 19 14:23:17 2007
@@ -1,9 +1,16 @@
 -------------------------------------------------------------------
+Wed Sep 19 14:19:49 CEST 2007 - ma@xxxxxxx
+
+- Enable package cache during commit. (#326249)
+- version 3.24.2
+- revision 7309
+
+-------------------------------------------------------------------
 Tue Sep 18 14:01:02 CEST 2007 - schubi@xxxxxxx
 
 - 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
 
 -------------------------------------------------------------------

Modified: trunk/libzypp/zypp/target/CommitPackageCacheReadAhead.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/CommitPackageCacheReadAhead.cc?rev=7309&r1=7308&r2=7309&view=diff
==============================================================================
--- trunk/libzypp/zypp/target/CommitPackageCacheReadAhead.cc (original)
+++ trunk/libzypp/zypp/target/CommitPackageCacheReadAhead.cc Wed Sep 19 14:23:17 2007
@@ -66,10 +66,10 @@
     {
       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" );
     }
 
     ///////////////////////////////////////////////////////////////////

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages