Author: dmacvicar
Date: Wed Feb 6 17:56:32 2008
New Revision: 8503
URL: http://svn.opensuse.org/viewcvs/zypp?rev=8503&view=rev
Log:
build again, broke srcpackage install :-(
Modified:
branches/tmp/ma/jump_sat/zypper/src/zypper-callbacks.cc
branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc
branches/tmp/ma/jump_sat/zypper/src/zypper.h
Modified: branches/tmp/ma/jump_sat/zypper/src/zypper-callbacks.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/zypper/src/zypper-callbacks.cc?rev=8503&r1=8502&r2=8503&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/zypper/src/zypper-callbacks.cc (original)
+++ branches/tmp/ma/jump_sat/zypper/src/zypper-callbacks.cc Wed Feb 6 17:56:32 2008
@@ -4,6 +4,7 @@
#include
#include "zypp/base/Logger.h"
+#include "zypp/Resolvable.h"
#include "AliveCursor.h"
#include "zypper.h"
Modified: branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc?rev=8503&r1=8502&r2=8503&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc (original)
+++ branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc Wed Feb 6 17:56:32 2008
@@ -1722,12 +1722,12 @@
it != arguments.end(); ++it)
{
SrcPackage::Ptr srcpkg;
-
- gData.repo_resolvables.forEach(
- functor::chain(
- resfilter::ByName(*it),
- resfilter::ByKind(ResTraits<SrcPackage>::kind)),
- FindSrcPackage(srcpkg));
+// FIXME
+// gData.repo_resolvables.forEach(
+// functor::chain(
+// resfilter::ByName(*it),
+// resfilter::ByKind(ResTraits<SrcPackage>::kind)),
+// FindSrcPackage(srcpkg));
if (srcpkg)
{
Modified: branches/tmp/ma/jump_sat/zypper/src/zypper.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/zypper/src/zypper.h?rev=8503&r1=8502&r2=8503&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/zypper/src/zypper.h (original)
+++ branches/tmp/ma/jump_sat/zypper/src/zypper.h Wed Feb 6 17:56:32 2008
@@ -9,7 +9,6 @@
#include "zypp/base/NonCopyable.h"
#include "zypp/base/PtrTypes.h"
-#include "zypp/ResStore.h"
#include "zypp/RepoInfo.h"
#include "zypp/RepoManager.h"
@@ -149,8 +148,6 @@
std::listzypp::RepoInfo additional_repos;
int patches_count;
int security_patches_count;
- zypp::ResStore repo_resolvables;
- zypp::ResStore target_resolvables;
zypp::RepoInfo current_repo;
// hack to enable media progress reporting in the commit phase in normal
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
