Mailinglist Archive: zypp-commit (194 mails)

[mlandres@xxxxxxxxxxxxxxxx]

Author: mlandres
Date: Wed Jun  4 14:56:30 2008
New Revision: 10339

URL: http://svn.opensuse.org/viewcvs/zypp?rev=10339&view=rev
Log:
Fix crash when requesting disk usage without a target loaded. (bnc #396755)

Modified:
    branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake
    branches/SuSE-Linux-11_0-Branch/libzypp/devel/devel.ma/NewPool.cc
    branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes
    branches/SuSE-Linux-11_0-Branch/libzypp/zypp/DiskUsageCounter.cc

Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake
URL: 
http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake?rev=10339&r1=10338&r2=10339&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake (original)
+++ branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake Wed Jun  4 14:56:30 
2008
@@ -47,4 +47,4 @@
 SET(LIBZYPP_MAJOR "4")
 SET(LIBZYPP_MINOR "26")
 SET(LIBZYPP_COMPATMINOR "24")
-SET(LIBZYPP_PATCH "2")
+SET(LIBZYPP_PATCH "3")

Modified: branches/SuSE-Linux-11_0-Branch/libzypp/devel/devel.ma/NewPool.cc
URL: 
http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/devel/devel.ma/NewPool.cc?rev=10339&r1=10338&r2=10339&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/libzypp/devel/devel.ma/NewPool.cc (original)
+++ branches/SuSE-Linux-11_0-Branch/libzypp/devel/devel.ma/NewPool.cc Wed Jun  
4 14:56:30 2008
@@ -559,6 +559,15 @@
   }
   ///////////////////////////////////////////////////////////////////
   ///////////////////////////////////////////////////////////////////
+
+  for_( it, pool.byKindBegin<Package>(), pool.byKindEnd<Package>() )
+  {
+    it->status().setTransact( true, ResStatus::USER );
+  }
+
+  SEC << zypp::getZYpp()->diskUsage() << endl;
+
+
   MIL << (*pool.byKindBegin<SrcPackage>())->provides() << endl;
 
   MIL << (Capability( "srcpackage:foo == 1.0" ).detail()) << endl;

Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes
URL: 
http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes?rev=10339&r1=10338&r2=10339&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes (original)
+++ branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Wed Jun  4 
14:56:30 2008
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Wed Jun  4 14:53:13 CEST 2008 - ma@xxxxxxx
+
+- Fix crash when requesting disk usage without a target loaded. (bnc #396755)
+- version 4.26.3
+- revision 10339
+
+-------------------------------------------------------------------
 Wed Jun  4 13:50:13 CEST 2008 - ma@xxxxxxx
 
 - Fix memory corruption in curl media handler (bnc #396979) 

Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/DiskUsageCounter.cc
URL: 
http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/zypp/DiskUsageCounter.cc?rev=10339&r1=10338&r2=10339&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/DiskUsageCounter.cc (original)
+++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/DiskUsageCounter.cc Wed Jun  4 
14:56:30 2008
@@ -42,6 +42,13 @@
     }
 
     sat::Pool satpool( sat::Pool::instance() );
+    if ( ! satpool.findSystemRepo() )
+    {
+      // take care we have at least an empty stystem repo.
+      // ::pool_calc_duchanges requires it.
+      satpool.systemRepo();
+      satpool.prepare();
+    }
 
     // init satsolver result vector with mountpoints
     static const ::DUChanges _initdu = { 0, 0, 0 };

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