Author: dmacvicar
Date: Tue Jan 29 23:36:34 2008
New Revision: 8398
URL: http://svn.opensuse.org/viewcvs/zypp?rev=8398&view=rev
Log:
misc compiles
Modified:
branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc
branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc
branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.h
Modified: branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc?rev=8398&r1=8397&r2=8398&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc (original)
+++ branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc Tue Jan 29 23:36:34 2008
@@ -118,19 +118,19 @@
const RepoInfo &info,
const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() )
{
- ProgressData progress;
- callback::SendReport<ProgressReport> report;
- progress.sendTo( ProgressReportAdaptor( progressrcv, report ) );
- progress.name(str::form(_("Cleaning repository '%s' cache"), info.name().c_str()));
-
- if ( !store.isCached(info.alias()) )
- return;
-
- MIL << info.alias() << " cleaning cache..." << endl;
-
- CombinedProgressData subprogrcv(progress);
-
- store.cleanRepository(info.alias(), subprogrcv);
+// ProgressData progress;
+// callback::SendReport<ProgressReport> report;
+// progress.sendTo( ProgressReportAdaptor( progressrcv, report ) );
+// progress.name(str::form(_("Cleaning repository '%s' cache"), info.name().c_str()));
+//
+// if ( !store.isCached(info.alias()) )
+// return;
+//
+// MIL << info.alias() << " cleaning cache..." << endl;
+//
+// CombinedProgressData subprogrcv(progress);
+//
+// store.cleanRepository(info.alias(), subprogrcv);
}
////////////////////////////////////////////////////////////////////////////
Modified: branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc?rev=8398&r1=8397&r2=8398&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc (original)
+++ branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc Tue Jan 29 23:36:34 2008
@@ -12,7 +12,6 @@
#include "zypp/cache/CacheAttributes.h"
#include "satsolver/repo.h"
-#include "satsolver/attr_store.h"
using namespace std;
using namespace zypp;
@@ -51,13 +50,14 @@
struct SolvStore::Impl
{
- Impl( const Pathname &solvdir )
+ Impl( const Pathname &solvdir, const string &alias )
: name_cache_hits(0)
, dir_cache_hits(0)
, _cachedir(solvdir)
{
_pool = pool_create();
- _attr = new_store(_pool);
+ _repo = repo_create(_pool, alias.c_str() );
+ _repodata = repo_add_repodata(_repo);
_attr_package_authors = str2id(_pool, "package:authors", 1);
_attr_package_description = str2id(_pool, "package:description", 1);
@@ -80,9 +80,9 @@
_attr_package_time = str2id(_pool, "package:time", 1);
}
- Impl()
+ Impl( const std::string &alias)
{
- Impl( getZYpp()->homePath() );
+ Impl( getZYpp()->homePath(), alias );
}
~Impl()
@@ -98,11 +98,10 @@
int dir_cache_hits;
_Pool *_pool;
+ _Repo *_repo;
- map