changes

diff --git a/devel/devel.ma/Parse.cc b/devel/devel.ma/Parse.cc
index c9dcf1a83ad37c1a952af80c00102f0d9f8bfb70..cf943db954c33b89bf4cc32f6ddbecc22d50680e 100644 (file)
--- a/devel/devel.ma/Parse.cc
+++ b/devel/devel.ma/Parse.cc
@@ -35,11 +35,12 @@
 #include "zypp/RepoInfo.h"
 
 #include "zypp/ui/PatchContents.h"
+#include "zypp/ResPoolProxy.h"
 
 using namespace std;
 using namespace zypp;
 using namespace zypp::functor;
-
+using namespace zypp::ui;
 using zypp::parser::TagParser;
 
 ///////////////////////////////////////////////////////////////////
@@ -48,14 +49,44 @@ static const Pathname sysRoot( "/Local/ROOT" );
 
 ///////////////////////////////////////////////////////////////////
 
+template<class _Res>
+Selectable::Ptr getSel( const std::string & name_r )
+{
+  ResPoolProxy uipool( getZYpp()->poolProxy() );
+  for_(it, uipool.byKindBegin<_Res>(), uipool.byKindEnd<_Res>() )
+  {
+    if ( (*it)->name() == name_r )
+      return (*it);
+  }
+  return 0;
+}
+
+void dbgDu( Selectable::Ptr sel )
+{
+  if ( sel->installedPoolItem() )
+  {
+    DBG << "i: " << sel->installedPoolItem() << endl
+        << sel->installedPoolItem()->diskusage() << endl;
+  }
+  if ( sel->candidatePoolItem() )
+  {
+    DBG << "c: " << sel->candidatePoolItem() << endl
+        << sel->candidatePoolItem()->diskusage() << endl;
+  }
+  INT << sel << endl
+      << getZYpp()->diskUsage() << endl;
+}
+
+///////////////////////////////////////////////////////////////////
+
 struct Xprint
 {
   bool operator()( const PoolItem & obj_r )
   {
-    //handle( asKind<Package>( obj_r ) );
-    //handle( asKind<Patch>( obj_r ) );
-    handle( asKind<Pattern>( obj_r ) );
-    handle( asKind<Product>( obj_r ) );
+     handle( asKind<Package>( obj_r ) );
+//     handle( asKind<Patch>( obj_r ) );
+//     handle( asKind<Pattern>( obj_r ) );
+//     handle( asKind<Product>( obj_r ) );
     return true;
   }
 
@@ -64,6 +95,7 @@ struct Xprint
     if ( !p )
       return;
 
+    WAR << p->size() << endl;
     MIL << p->diskusage() << endl;
   }
 
@@ -425,6 +457,25 @@ int main( int argc, char * argv[] )
 
   std::for_each( pool.begin(), pool.end(), Xprint() );
 
+  DiskUsageCounter::MountPointSet fakePart;
+  fakePart.insert( DiskUsageCounter::MountPoint( "/", 1024, 10240, 5120, 0LL, false ) );
+  getZYpp()->setPartitions( fakePart );
+
+  USR << getZYpp()->getPartitions() << endl;
+  INT << getZYpp()->diskUsage() << endl;
+
+  Selectable::Ptr sel( getSel<Package>( "rpm" ) );
+  dbgDu( sel );
+
+  MIL << sel->set_status( ui::S_Del ) << endl;
+  dbgDu( sel );
+
+  MIL << sel->set_status( ui::S_Update ) << endl;
+  dbgDu( sel );
+
+  MIL << sel->set_status( ui::S_KeepInstalled ) << endl;
+  dbgDu( sel );
+
   ///////////////////////////////////////////////////////////////////
   INT << "===[END]============================================" << endl << endl;
   zypp::base::LogControl::instance().logNothing();

diff --git a/package/libzypp.changes b/package/libzypp.changes
index da27b9daa1357864d8a27be3f3eb7c21a8445fae..d84cc26668c014ee2f2c7572f6c8d36d047587fc 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -4,6 +4,7 @@ Tue Sep 11 14:54:44 CEST 2007 - ma@suse.de
 - Don't fail if a product is deleted multiple times (e.g. due to
   obsoletes and an explicit deleted request). (#308746)
 - version 3.22.7
+- revision 7184
 
 -------------------------------------------------------------------
 Tue Sep 11 13:52:47 CEST 2007 - jkupec@suse.cz

diff --git a/zypp/DiskUsageCounter.cc b/zypp/DiskUsageCounter.cc
index ab8c200ee3c800f1e6ac6deaee323a7db776f70f..5b54497549acd5fa0ada975cd58f4b56803d40b8 100644 (file)
--- a/zypp/DiskUsageCounter.cc
+++ b/zypp/DiskUsageCounter.cc
@@ -305,7 +305,11 @@ namespace zypp
 
   std::ostream & operator<<( std::ostream & str, const DiskUsageCounter::MountPoint & obj )
   {
-    str << "dir:[" << obj.dir << "] [ bs: " << obj.block_size << " ts: " << obj.total_size << "]" << std::endl;
+    str << "dir:[" << obj.dir << "] [ bs: " << obj.block_size
+        << " ts: " << obj.total_size
+        << " us: " << obj.used_size
+        << " +-: " << obj.pkg_size
+        << "]" << std::endl;
     return str;
   }
 

diff --git a/zypp/target/rpm/RpmPackageImpl.cc b/zypp/target/rpm/RpmPackageImpl.cc
index bb63c99e3eab414d194f454e5fe97a185d9537a3..c50e7fe9d2576cd9595a6c19acdabe6e99d00afe 100644 (file)
--- a/zypp/target/rpm/RpmPackageImpl.cc
+++ b/zypp/target/rpm/RpmPackageImpl.cc
@@ -56,6 +56,7 @@ RPMPackageImpl::RPMPackageImpl(
   // we know we are reading english.
   _description.setText(data->tag_description(), Locale("en"));
   data->tag_du(_disk_usage);
+  SEC << _disk_usage << endl;
   _location.setDownloadSize(data->tag_archivesize());
 }
 
@@ -199,7 +200,7 @@ std::string RPMPackageImpl::type() const
 }
 
 /** */
-const DiskUsage & RPMPackageImpl::diskUsage() const
+const DiskUsage & RPMPackageImpl::diskusage() const
 {
   return _disk_usage;
 }

diff --git a/zypp/target/rpm/RpmPackageImpl.h b/zypp/target/rpm/RpmPackageImpl.h
index 2e27754577ba6197f64883a65a318e543d09b326..cab485a2e57870221724bfa44cf6634591959037 100644 (file)
--- a/zypp/target/rpm/RpmPackageImpl.h
+++ b/zypp/target/rpm/RpmPackageImpl.h
@@ -85,7 +85,7 @@ public:
   /** */
   virtual std::string type() const;
   /** */
-  virtual const DiskUsage & diskUsage() const;
+  virtual const DiskUsage & diskusage() const;
   /** */
   virtual Repository repository() const;