Author: dmacvicar
Date: Thu Jun 21 12:09:24 2007
New Revision: 5818
URL: http://svn.opensuse.org/viewcvs/zypp?rev=5818&view=rev
Log:
- everything compiles. Only query-pool disabled for now
Added:
branches/REFACTORING-10_3/libzypp/zypp/repo/Applydeltarpm.cc
- copied, changed from r5803, trunk/libzypp/zypp/source/Applydeltarpm.cc
branches/REFACTORING-10_3/libzypp/zypp/repo/Applydeltarpm.h
- copied unchanged from r5803, trunk/libzypp/zypp/source/Applydeltarpm.h
branches/REFACTORING-10_3/libzypp/zypp/repo/PackageDelta.cc
- copied, changed from r5803, trunk/libzypp/zypp/source/PackageDelta.cc
branches/REFACTORING-10_3/libzypp/zypp/repo/PackageDelta.h
- copied unchanged from r5803, trunk/libzypp/zypp/source/PackageDelta.h
branches/REFACTORING-10_3/libzypp/zypp/repo/SUSEMediaVerifier.cc
- copied, changed from r5803, trunk/libzypp/zypp/source/SUSEMediaVerifier.cc
branches/REFACTORING-10_3/libzypp/zypp/repo/SUSEMediaVerifier.h
- copied, changed from r5803, trunk/libzypp/zypp/source/SUSEMediaVerifier.h
branches/REFACTORING-10_3/libzypp/zypp/repo/plaindir/
- copied from r5803, trunk/libzypp/zypp/source/plaindir/
branches/REFACTORING-10_3/libzypp/zypp/repo/plaindir/.cvsignore
- copied unchanged from r5817, trunk/libzypp/zypp/source/plaindir/.cvsignore
branches/REFACTORING-10_3/libzypp/zypp/repo/plaindir/PlaindirImpl.cc
- copied, changed from r5817, trunk/libzypp/zypp/source/plaindir/PlaindirImpl.cc
branches/REFACTORING-10_3/libzypp/zypp/repo/plaindir/PlaindirImpl.h
- copied, changed from r5817, trunk/libzypp/zypp/source/plaindir/PlaindirImpl.h
Removed:
branches/REFACTORING-10_3/libzypp/zypp/Source.cc
branches/REFACTORING-10_3/libzypp/zypp/Source.h
branches/REFACTORING-10_3/libzypp/zypp/SourceCache.cc
branches/REFACTORING-10_3/libzypp/zypp/SourceCache.h
branches/REFACTORING-10_3/libzypp/zypp/SourceFactory.cc
branches/REFACTORING-10_3/libzypp/zypp/SourceFactory.h
branches/REFACTORING-10_3/libzypp/zypp/SourceFeed.cc
branches/REFACTORING-10_3/libzypp/zypp/SourceFeed.h
branches/REFACTORING-10_3/libzypp/zypp/SourceManager.cc
branches/REFACTORING-10_3/libzypp/zypp/SourceManager.h
branches/REFACTORING-10_3/libzypp/zypp/parser/SAXParser.cc
branches/REFACTORING-10_3/libzypp/zypp/parser/SAXParser.h
branches/REFACTORING-10_3/libzypp/zypp/parser/tagfile/
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMFileListParser.cc
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMFileListParser.h
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMGroupParser.cc
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMGroupParser.h
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMOtherParser.cc
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMOtherParser.h
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMParser.h
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMParserData.cc
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMParserData.h
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMPatchParser.cc
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMPatchParser.h
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMPatchesParser.cc
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMPatchesParser.h
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMPatternParser.cc
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMPatternParser.h
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMPrimaryParser.cc
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMPrimaryParser.h
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMProductParser.cc
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMProductParser.h
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMRepomdParser.cc
branches/REFACTORING-10_3/libzypp/zypp/parser/yum/YUMRepomdParser.h
branches/REFACTORING-10_3/libzypp/zypp/source/Applydeltarpm.cc
branches/REFACTORING-10_3/libzypp/zypp/source/Applydeltarpm.h
branches/REFACTORING-10_3/libzypp/zypp/source/Builtin.h
branches/REFACTORING-10_3/libzypp/zypp/source/MediaSet.cc
branches/REFACTORING-10_3/libzypp/zypp/source/MediaSet.h
branches/REFACTORING-10_3/libzypp/zypp/source/PackageDelta.cc
branches/REFACTORING-10_3/libzypp/zypp/source/PackageDelta.h
branches/REFACTORING-10_3/libzypp/zypp/source/PackageProvider.cc
branches/REFACTORING-10_3/libzypp/zypp/source/PackageProvider.h
branches/REFACTORING-10_3/libzypp/zypp/source/SUSEMediaVerifier.cc
branches/REFACTORING-10_3/libzypp/zypp/source/SUSEMediaVerifier.h
branches/REFACTORING-10_3/libzypp/zypp/source/SourceImpl.cc
branches/REFACTORING-10_3/libzypp/zypp/source/SourceImpl.h
branches/REFACTORING-10_3/libzypp/zypp/source/SourceInfo.cc
branches/REFACTORING-10_3/libzypp/zypp/source/SourceInfo.h
branches/REFACTORING-10_3/libzypp/zypp/source/SourceProvideFile.cc
branches/REFACTORING-10_3/libzypp/zypp/source/SourceProvideFile.h
branches/REFACTORING-10_3/libzypp/zypp/source/plaindir/
branches/REFACTORING-10_3/libzypp/zypp/source/susetags/
branches/REFACTORING-10_3/libzypp/zypp/source/yum/
Modified:
branches/REFACTORING-10_3/libzypp/doc/autodoc/Doxyfile.cmake
branches/REFACTORING-10_3/libzypp/tests/zypp/RepoManager_test.cc
branches/REFACTORING-10_3/libzypp/tools/CMakeLists.txt
branches/REFACTORING-10_3/libzypp/tools/registration/zypp-query-pool.cc
branches/REFACTORING-10_3/libzypp/zypp/CMakeLists.txt
branches/REFACTORING-10_3/libzypp/zypp/CapFilters.h
branches/REFACTORING-10_3/libzypp/zypp/FileChecker.h
branches/REFACTORING-10_3/libzypp/zypp/KeyRing.cc
branches/REFACTORING-10_3/libzypp/zypp/MediaSetAccess.cc
branches/REFACTORING-10_3/libzypp/zypp/Package.cc
branches/REFACTORING-10_3/libzypp/zypp/Repository.cc
branches/REFACTORING-10_3/libzypp/zypp/Repository.h
branches/REFACTORING-10_3/libzypp/zypp/ResFilters.h
branches/REFACTORING-10_3/libzypp/zypp/ResObject.cc
branches/REFACTORING-10_3/libzypp/zypp/ResObject.h
branches/REFACTORING-10_3/libzypp/zypp/ResPool.h
branches/REFACTORING-10_3/libzypp/zypp/Resolvable.cc
branches/REFACTORING-10_3/libzypp/zypp/SrcPackage.cc
branches/REFACTORING-10_3/libzypp/zypp/VendorAttr.cc
branches/REFACTORING-10_3/libzypp/zypp/ZYpp.cc
branches/REFACTORING-10_3/libzypp/zypp/ZYpp.h
branches/REFACTORING-10_3/libzypp/zypp/ZYppCallbacks.h
branches/REFACTORING-10_3/libzypp/zypp/detail/PackageImplIf.h
branches/REFACTORING-10_3/libzypp/zypp/detail/ResObjectImplIf.cc
branches/REFACTORING-10_3/libzypp/zypp/detail/ResObjectImplIf.h
branches/REFACTORING-10_3/libzypp/zypp/parser/IniParser.cc
branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLSourceCacheParser.cc
branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLSourceCacheParser.h
branches/REFACTORING-10_3/libzypp/zypp/pool/GetResolvablesToInsDel.cc
branches/REFACTORING-10_3/libzypp/zypp/pool/PoolTraits.h
branches/REFACTORING-10_3/libzypp/zypp/repo/DeltaCandidates.cc
branches/REFACTORING-10_3/libzypp/zypp/repo/DeltaCandidates.h
branches/REFACTORING-10_3/libzypp/zypp/repo/PackageProvider.cc
branches/REFACTORING-10_3/libzypp/zypp/repo/RepoProvideFile.cc
branches/REFACTORING-10_3/libzypp/zypp/repo/cached/AtomImpl.cc
branches/REFACTORING-10_3/libzypp/zypp/repo/cached/AtomImpl.h
branches/REFACTORING-10_3/libzypp/zypp/repo/cached/MessageImpl.cc
branches/REFACTORING-10_3/libzypp/zypp/repo/cached/MessageImpl.h
branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PackageImpl.cc
branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PackageImpl.h
branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatchImpl.cc
branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatchImpl.h
branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.cc
branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.h
branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.cc
branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.h
branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ScriptImpl.cc
branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ScriptImpl.h
branches/REFACTORING-10_3/libzypp/zypp/repo/cached/SrcPackageImpl.cc
branches/REFACTORING-10_3/libzypp/zypp/repo/cached/SrcPackageImpl.h
branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.cc
branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.h
branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PackageImpl.h
branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.h
branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ScriptImpl.h
branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Resolver.cc
branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Resolver.h
branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverContext.cc
branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverContext.h
branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverInfo.cc
branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverQueue.cc
branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Testcase.cc
branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Testcase.h
branches/REFACTORING-10_3/libzypp/zypp/target/CommitPackageCacheReadAhead.cc
branches/REFACTORING-10_3/libzypp/zypp/target/CommitPackageCacheReadAhead.h
branches/REFACTORING-10_3/libzypp/zypp/target/TargetImpl.cc
branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmDb.cc
branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmDb.h
branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmPackageImpl.cc
branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmPackageImpl.h
branches/REFACTORING-10_3/libzypp/zypp/target/store/Backend.h
branches/REFACTORING-10_3/libzypp/zypp/target/store/PersistentStorage.cc
branches/REFACTORING-10_3/libzypp/zypp/target/store/PersistentStorage.h
branches/REFACTORING-10_3/libzypp/zypp/target/store/XMLFilesBackend.cc
branches/REFACTORING-10_3/libzypp/zypp/target/store/XMLFilesBackend.h
branches/REFACTORING-10_3/libzypp/zypp/target/store/serialize.cc
branches/REFACTORING-10_3/libzypp/zypp/target/store/serialize.h
branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLAtomImpl.h
branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLProductImpl.h
branches/REFACTORING-10_3/libzypp/zypp/zypp_detail/ZYppImpl.cc
branches/REFACTORING-10_3/libzypp/zypp/zypp_detail/ZYppImpl.h
Modified: branches/REFACTORING-10_3/libzypp/doc/autodoc/Doxyfile.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/doc/autodoc/Doxyfile.cmake?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/doc/autodoc/Doxyfile.cmake (original)
+++ branches/REFACTORING-10_3/libzypp/doc/autodoc/Doxyfile.cmake Thu Jun 21 12:09:24 2007
@@ -201,8 +201,8 @@
GROUP_GRAPHS = NO
UML_LOOK = NO
TEMPLATE_RELATIONS = NO
-INCLUDE_GRAPH = NO
-INCLUDED_BY_GRAPH = NO
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
CALL_GRAPH = NO
GRAPHICAL_HIERARCHY = NO
DIRECTORY_GRAPH = NO
Modified: branches/REFACTORING-10_3/libzypp/tests/zypp/RepoManager_test.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/tests/zypp/RepoManager_test.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/tests/zypp/RepoManager_test.cc (original)
+++ branches/REFACTORING-10_3/libzypp/tests/zypp/RepoManager_test.cc Thu Jun 21 12:09:24 2007
@@ -10,6 +10,7 @@
#include "zypp/PublicKey.h"
#include "zypp/TmpPath.h"
#include "zypp/ResStore.h"
+#include "zypp/PathInfo.h"
#include "zypp/RepoManager.h"
Modified: branches/REFACTORING-10_3/libzypp/tools/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/tools/CMakeLists.txt?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/tools/CMakeLists.txt (original)
+++ branches/REFACTORING-10_3/libzypp/tools/CMakeLists.txt Thu Jun 21 12:09:24 2007
@@ -1,3 +1,3 @@
-ADD_SUBDIRECTORY( registration )
+#ADD_SUBDIRECTORY( registration )
ADD_SUBDIRECTORY( package-manager )
ADD_SUBDIRECTORY( cachetools )
\ No newline at end of file
Modified: branches/REFACTORING-10_3/libzypp/tools/registration/zypp-query-pool.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/tools/registration/zypp-query-pool.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/tools/registration/zypp-query-pool.cc (original)
+++ branches/REFACTORING-10_3/libzypp/tools/registration/zypp-query-pool.cc Thu Jun 21 12:09:24 2007
@@ -5,7 +5,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -80,7 +80,7 @@
MIL << "query_pool kind '" << kind << "', repository '" << repository << "'" << endl;
- SourceManager_Ptr manager = SourceManager::sourceManager();
+ RepoManager manager;
if (!system)
{
Modified: branches/REFACTORING-10_3/libzypp/zypp/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/CMakeLists.txt?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/CMakeLists.txt (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/CMakeLists.txt Thu Jun 21 12:09:24 2007
@@ -4,10 +4,6 @@
ADD_DEFINITIONS(-DLOCALEDIR=\\\"/usr/share/libzypp\\\" -DTEXTDOMAIN=\\\"zypp\\\" )
-IF(ZYPP_REFACTORING)
- ADD_DEFINITIONS(-DZYPP_REFACTORING)
-ENDIF(ZYPP_REFACTORING)
-
ADD_EXECUTABLE(mkarray ${CMAKE_SOURCE_DIR}/zypp/cache/schema/mkarray.c )
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
#FILE(WRITE filename "message to write"... )
@@ -54,11 +50,6 @@
Package.cc
Pathname.cc
ProgressData.cc
- Source.cc
- SourceFactory.cc
- SourceManager.cc
- SourceCache.cc
- SourceFeed.cc
SrcPackage.cc
SysContent.cc
Target.cc
@@ -433,7 +424,6 @@
parser/IniParser.cc
parser/IniDict.cc
parser/LibXMLHelper.cc
- parser/SAXParser.cc
parser/XMLNodeIterator.cc
parser/RepoFileReader.cc
)
@@ -445,7 +435,6 @@
parser/IniDict.h
parser/LibXMLHelper.h
parser/ParserProgress.h
- parser/SAXParser.h
parser/XMLNodeIterator.h
parser/xml_parser_assert.h
parser/RepoFileReader.h
@@ -481,19 +470,6 @@
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/susetags
)
-SET( zypp_parser_tagfile_SRCS
- parser/tagfile/TagFileParser.cc
-)
-
-SET( zypp_parser_tagfile_HEADERS
- parser/tagfile/TagFileParser.h
-)
-
-INSTALL( FILES
- ${zypp_parser_tagfile_HEADERS}
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/tagfile
-)
-
SET( zypp_parser_xml_SRCS
parser/xml/Node.cc
parser/xml/ParseDef.cc
@@ -547,16 +523,6 @@
)
SET( zypp_parser_yum_SRCS
- parser/yum/YUMFileListParser.cc
- parser/yum/YUMGroupParser.cc
- parser/yum/YUMOtherParser.cc
- parser/yum/YUMParserData.cc
- parser/yum/YUMPatchParser.cc
- parser/yum/YUMPatchesParser.cc
- parser/yum/YUMPatternParser.cc
- parser/yum/YUMPrimaryParser.cc
- parser/yum/YUMProductParser.cc
- parser/yum/YUMRepomdParser.cc
parser/yum/RepoParser.cc
parser/yum/FileReaderBaseImpl.cc
parser/yum/RepomdFileReader.cc
@@ -570,17 +536,6 @@
)
SET( zypp_parser_yum_HEADERS
- parser/yum/YUMFileListParser.h
- parser/yum/YUMGroupParser.h
- parser/yum/YUMOtherParser.h
- parser/yum/YUMParser.h
- parser/yum/YUMParserData.h
- parser/yum/YUMPatchParser.h
- parser/yum/YUMPatchesParser.h
- parser/yum/YUMPatternParser.h
- parser/yum/YUMPrimaryParser.h
- parser/yum/YUMProductParser.h
- parser/yum/YUMRepomdParser.h
parser/yum/RepoParser.h
parser/yum/RepoParserOpts.h
parser/yum/FileReaderBase.h
@@ -704,111 +659,17 @@
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/solver/detail
)
-SET( zypp_source_SRCS
- source/Applydeltarpm.cc
- source/MediaSet.cc
- source/PackageDelta.cc
- source/PackageProvider.cc
- source/SourceImpl.cc
- source/SourceInfo.cc
- source/SourceProvideFile.cc
- source/SUSEMediaVerifier.cc
-)
-
-SET( zypp_source_HEADERS
- source/Applydeltarpm.h
- source/Builtin.h
- source/MediaSet.h
- source/PackageDelta.h
- source/PackageProvider.h
- source/SourceImpl.h
- source/SourceInfo.h
- source/SourceProvideFile.h
- source/SUSEMediaVerifier.h
-)
-
-INSTALL( FILES
- ${zypp_source_HEADERS}
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/source
-)
-
-SET( zypp_source_plaindir_SRCS
- source/plaindir/PlaindirImpl.cc
-)
-
-SET( zypp_source_plaindir_HEADERS
- source/plaindir/PlaindirImpl.h
-)
-
-INSTALL( FILES
- ${zypp_source_plaindir_HEADERS}
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/source/plaindir
-)
-
-SET( zypp_source_susetags_SRCS
- source/susetags/MediaMetadataParser.cc
- source/susetags/MediaPatchesMetadataParser.cc
- source/susetags/PackagesLangParser.cc
- source/susetags/PackagesParser.cc
- source/susetags/PatternTagFileParser.cc
- source/susetags/ProductMetadataParser.cc
- source/susetags/SelectionTagFileParser.cc
- source/susetags/SuseTagsImpl.cc
- source/susetags/SuseTagsPackageImpl.cc
- source/susetags/SuseTagsPatternImpl.cc
- source/susetags/SuseTagsProductImpl.cc
- source/susetags/SuseTagsSelectionImpl.cc
- source/susetags/SuseTagsSrcPackageImpl.cc
-)
-
-SET( zypp_source_susetags_HEADERS
- source/susetags/MediaMetadataParser.h
- source/susetags/MediaPatchesMetadataParser.h
- source/susetags/PackagesLangParser.h
- source/susetags/PackagesParser.h
- source/susetags/PatternTagFileParser.h
- source/susetags/ProductMetadataParser.h
- source/susetags/SelectionTagFileParser.h
- source/susetags/SuseTagsImpl.h
- source/susetags/SuseTagsPackageImpl.h
- source/susetags/SuseTagsPatternImpl.h
- source/susetags/SuseTagsProductImpl.h
- source/susetags/SuseTagsSelectionImpl.h
- source/susetags/SuseTagsSrcPackageImpl.h
-)
-
-INSTALL( FILES
- ${zypp_source_susetags_HEADERS}
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/source/susetags
-)
-
-SET( zypp_source_yum_SRCS
- source/yum/YUMAtomImpl.cc
- source/yum/YUMGroupImpl.cc
- source/yum/YUMMessageImpl.cc
- source/yum/YUMPackageImpl.cc
- source/yum/YUMPatchImpl.cc
- source/yum/YUMPatternImpl.cc
- source/yum/YUMProductImpl.cc
- source/yum/YUMScriptImpl.cc
- source/yum/YUMSourceImpl.cc
-)
-
-SET( zypp_source_yum_HEADERS
- source/yum/YUMAtomImpl.h
- source/yum/YUMGroupImpl.h
- source/yum/YUMMessageImpl.h
- source/yum/YUMPackageImpl.h
- source/yum/YUMPatchImpl.h
- source/yum/YUMPatternImpl.h
- source/yum/YUMProductImpl.h
- source/yum/YUMScriptImpl.h
- source/yum/YUMSourceImpl.h
+SET( zypp_repo_plaindir_SRCS
+ repo/plaindir/PlaindirImpl.cc
+)
+
+SET( zypp_repo_plaindir_HEADERS
+ repo/plaindir/PlaindirImpl.h
)
INSTALL( FILES
- ${zypp_source_yum_HEADERS}
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/source/yum
+ ${zypp_repo_plaindir_HEADERS}
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/repo/plaindir
)
SET( zypp_target_SRCS
@@ -1067,6 +928,9 @@
repo/PackageProvider.cc
repo/RepoProvideFile.cc
repo/DeltaCandidates.cc
+ repo/Applydeltarpm.cc
+ repo/PackageDelta.cc
+ repo/SUSEMediaVerifier.cc
)
SET( zypp_repo_HEADERS
@@ -1076,6 +940,9 @@
repo/PackageProvider.h
repo/RepoProvideFile.h
repo/DeltaCandidates.h
+ repo/Applydeltarpm.h
+ repo/PackageDelta.h
+ repo/SUSEMediaVerifier.h
)
INSTALL( FILES
@@ -1150,16 +1017,12 @@
${zypp_cache_SRCS}
${zypp_cache_sqlite3x_SRCS}
${zypp_pool_SRCS}
-${zypp_parser_tagfile_SRCS}
${zypp_parser_susetags_SRCS}
-${zypp_parser_yum2_SRCS}
${zypp_parser_xmlstore_SRCS}
${zypp_parser_xml_SRCS}
${zypp_parser_yum_SRCS}
${zypp_parser_SRCS}
-${zypp_source_plaindir_SRCS}
-${zypp_source_yum_SRCS}
-${zypp_source_susetags_SRCS}
+${zypp_repo_plaindir_SRCS}
${zypp_source_SRCS}
${zypp_data_SRCS}
${zypp_media_proxyinfo_SRCS}
@@ -1185,7 +1048,7 @@
)
SET( zypp_lib_HEADERS
-${zypp_source_plaindir_HEADERS}
+${zypp_repo_plaindir_HEADERS}
${zypp_target_store_xml_HEADERS}
${zypp_parser_tagfile_HEADERS}
${zypp_parser_susetags_HEADERS}
@@ -1235,9 +1098,8 @@
SET_LOGGROUP( "zypp" ${zypp_lib_SRCS} )
# override some defaults
-SET_LOGGROUP( "plaindir" ${zypp_source_plaindir_SRCS} )
+SET_LOGGROUP( "plaindir" ${zypp_repo_plaindir_SRCS} )
SET_LOGGROUP( "xmlstore" ${zypp_target_store_xml_SRCS} )
-SET_LOGGROUP( "tagfile" ${zypp_parser_tagfile_SRCS} )
#SET_LOGGROUP( "group" ${zypp_target_rpm_SRCS} )
#SET_LOGGROUP( "group" ${zypp_parser_yum2_SRCS} )
#SET_LOGGROUP( "group" ${zypp_capability_SRCS} )
Modified: branches/REFACTORING-10_3/libzypp/zypp/CapFilters.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/CapFilters.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/CapFilters.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/CapFilters.h Thu Jun 21 12:09:24 2007
@@ -14,6 +14,7 @@
#include "zypp/base/Functional.h"
#include "zypp/Capability.h"
+#include "zypp/ResObject.h"
///////////////////////////////////////////////////////////////////
namespace zypp
Modified: branches/REFACTORING-10_3/libzypp/zypp/FileChecker.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/FileChecker.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/FileChecker.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/FileChecker.h Thu Jun 21 12:09:24 2007
@@ -16,7 +16,7 @@
#include <list>
#include "zypp/base/Exception.h"
#include "zypp/base/Function.h"
-#include "zypp/Pathname.h"
+#include "zypp/PathInfo.h"
#include "zypp/CheckSum.h"
///////////////////////////////////////////////////////////////////
Modified: branches/REFACTORING-10_3/libzypp/zypp/KeyRing.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/KeyRing.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/KeyRing.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/KeyRing.cc Thu Jun 21 12:09:24 2007
@@ -21,7 +21,7 @@
#include "zypp/base/Logger.h"
#include "zypp/base/IOStream.h"
#include "zypp/base/String.h"
-#include "zypp/Pathname.h"
+#include "zypp/PathInfo.h"
#include "zypp/KeyRing.h"
#include "zypp/ExternalProgram.h"
#include "zypp/TmpPath.h"
Modified: branches/REFACTORING-10_3/libzypp/zypp/MediaSetAccess.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/MediaSetAccess.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/MediaSetAccess.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/MediaSetAccess.cc Thu Jun 21 12:09:24 2007
@@ -11,6 +11,7 @@
#include <fstream>
#include "zypp/base/LogTools.h"
+#include "zypp/base/UserRequestException.h"
#include "zypp/ZYppCallbacks.h"
#include "zypp/MediaSetAccess.h"
#include "zypp/PathInfo.h"
@@ -146,7 +147,7 @@
else if ( user == media::MediaChangeReport::IGNORE )
{
DBG << "Skipping" << endl;
- ZYPP_THROW ( source::SkipRequestedException("User-requested skipping of a file") );
+ ZYPP_THROW ( SkipRequestException("User-requested skipping of a file") );
}
else if ( user == media::MediaChangeReport::EJECT )
{
@@ -250,7 +251,7 @@
user = checkonly ? media::MediaChangeReport::ABORT :
report->requestMedia (
- Source_Ref::noSource,
+ Repository::noRepository,
media_nr,
reason,
excp.asUserString()
@@ -266,7 +267,7 @@
else if ( user == media::MediaChangeReport::IGNORE )
{
DBG << "Skipping" << endl;
- ZYPP_THROW ( source::SkipRequestedException("User-requested skipping of a file") );
+ ZYPP_THROW ( SkipRequestException("User-requested skipping of a file") );
}
else if ( user == media::MediaChangeReport::EJECT )
{
Modified: branches/REFACTORING-10_3/libzypp/zypp/Package.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/Package.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/Package.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/Package.cc Thu Jun 21 12:09:24 2007
@@ -10,7 +10,6 @@
*
*/
#include "zypp/Package.h"
-#include "zypp/source/SourceImpl.h"
#include "zypp/base/Exception.h"
using namespace std;
Modified: branches/REFACTORING-10_3/libzypp/zypp/Repository.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/Repository.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/Repository.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/Repository.cc Thu Jun 21 12:09:24 2007
@@ -63,6 +63,19 @@
return _pimpl->deltaRpms();
}
+ std::ostream & operator<<( std::ostream & str, const Repository & obj )
+ {
+ return str << "[" << obj.info().alias() << "]" << endl;
+ }
+
+ bool operator==( const Repository & lhs, const Repository & rhs )
+ {
+ return (lhs.info().alias() == rhs.info().alias());
+ }
+ bool operator<( const Repository & lhs, const Repository & rhs )
+ {
+ return (lhs.info().alias() < rhs.info().alias());
+ }
}
Modified: branches/REFACTORING-10_3/libzypp/zypp/Repository.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/Repository.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/Repository.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/Repository.h Thu Jun 21 12:09:24 2007
@@ -7,11 +7,14 @@
#include "zypp/base/PtrTypes.h"
#include "zypp/base/SafeBool.h"
-#include "zypp/ResStore.h"
+//#include "zypp/ResStore.h"
#include "zypp/RepoInfo.h"
+#include "zypp/repo/PackageDelta.h"
namespace zypp
{
+ class ResStore;
+
namespace repo
{
DEFINE_PTR_TYPE(RepositoryImpl);
@@ -56,7 +59,7 @@
/**
* \short Get the resolvables for repo
*/
- const ResStore & resolvables();
+ const zypp::ResStore & resolvables();
/**
* \short Repository info used to create this repository
@@ -94,6 +97,10 @@
RW_pointer _pimpl;
};
+ std::ostream & operator<<( std::ostream & str, const Repository & obj );
+ bool operator==( const Repository & lhs, const Repository & rhs );
+ bool operator<( const Repository & lhs, const Repository & rhs );
+
}
#endif
Modified: branches/REFACTORING-10_3/libzypp/zypp/ResFilters.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/ResFilters.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/ResFilters.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/ResFilters.h Thu Jun 21 12:09:24 2007
@@ -18,14 +18,15 @@
#include "zypp/Resolvable.h"
#include "zypp/CapFilters.h"
-#include "zypp/Source.h"
-
#include "zypp/PoolItem.h"
#include "zypp/CapAndItem.h"
+//#include "zypp/Repository.h"
+
///////////////////////////////////////////////////////////////////
namespace zypp
{ /////////////////////////////////////////////////////////////////
+ class Repository;
///////////////////////////////////////////////////////////////////
namespace resfilter
{ /////////////////////////////////////////////////////////////////
@@ -187,19 +188,19 @@
};
- /** Select ResObject by source. */
- struct BySource : public ResObjectFilterFunctor
+ /** Select ResObject by repository. */
+ struct ByRepository : public ResObjectFilterFunctor
{
- BySource( Source_Ref source_r )
- : _source( source_r )
+ ByRepository( Repository repository_r )
+ : _repository( repository_r )
{}
bool operator()( ResObject::constPtr p ) const
{
- return p->source() == _source;
+ return p->repository() == _repository;
}
- Source_Ref _source;
+ Repository _repository;
};
Modified: branches/REFACTORING-10_3/libzypp/zypp/ResObject.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/ResObject.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/ResObject.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/ResObject.cc Thu Jun 21 12:09:24 2007
@@ -10,7 +10,6 @@
*
*/
#include "zypp/ResObject.h"
-#include "zypp/source/SourceImpl.h"
#include "zypp/Repository.h"
#include "zypp/detail/ResObjectImplIf.h"
@@ -45,7 +44,7 @@
//
std::ostream & ResObject::dumpOn( std::ostream & str ) const
{
- str << "[S" << source().numericId() << ":" << sourceMediaNr() << "]";
+ str << "[S" << repository().numericId() << ":" << mediaNr() << "]";
return Resolvable::dumpOn( str );
}
@@ -79,12 +78,6 @@
ByteCount ResObject::archivesize() const
{ return pimpl().archivesize(); }
- Source_Ref ResObject::source() const
- { return pimpl().source(); }
-
- unsigned ResObject::sourceMediaNr() const
- { return pimpl().sourceMediaNr(); }
-
Repository ResObject::repository() const
{ return pimpl().repository(); }
@@ -100,9 +93,6 @@
Date ResObject::installtime() const
{ return pimpl().installtime(); }
- ZmdId ResObject::zmdid () const
- { return pimpl().zmdid(); }
-
/////////////////////////////////////////////////////////////////
} // namespace zypp
///////////////////////////////////////////////////////////////////
Modified: branches/REFACTORING-10_3/libzypp/zypp/ResObject.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/ResObject.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/ResObject.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/ResObject.h Thu Jun 21 12:09:24 2007
@@ -16,8 +16,10 @@
#include "zypp/detail/ResObjectImplIf.h"
#include "zypp/Resolvable.h"
+//#include "zypp/Repository.h"
#include "zypp/TranslatedText.h"
#include "zypp/NeedAType.h"
+#include "zypp/Date.h"
///////////////////////////////////////////////////////////////////
namespace zypp
@@ -26,7 +28,7 @@
class ImplConnect;
class ResObjectImplIf;
}
- class Source_Ref;
+
class Repository;
class ByteCount;
@@ -100,11 +102,6 @@
/**
* Source providing this resolvable
*/
- /*ZYPP_DEPRECATED */ Source_Ref source() const;
-
- /**
- * Source providing this resolvable
- */
Repository repository() const;
/**
@@ -112,18 +109,6 @@
* 0 if no media access is required.
*/
unsigned mediaNr() const;
-
- /**
- * Media number where the resolvable is located
- * 0 if no media access is required.
- */
- /* ZYPP_DEPRECATED */ unsigned sourceMediaNr() const;
-
- /**
- * \deprecated Use sourceMediaNr
- */
- /* ZYPP_DEPRECATED */ unsigned mediaId() const
- { return sourceMediaNr(); }
/**
* \TODO FIXME what is this?
@@ -141,11 +126,6 @@
*/
Date installtime() const;
- /**
- * \deprecated No replacement.
- */
- ZYPP_DEPRECATED ZmdId zmdid () const;
-
protected:
/** Ctor */
ResObject( const Kind & kind_r,
Modified: branches/REFACTORING-10_3/libzypp/zypp/ResPool.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/ResPool.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/ResPool.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/ResPool.h Thu Jun 21 12:09:24 2007
@@ -72,7 +72,7 @@
public:
/** \name Iterate through all ResObjects of a certain kind. */
//@{
- typedef resfilter::ByKind ByKind;
+ typedef zypp::resfilter::ByKind ByKind;
typedef filter_iterator byKind_iterator;
byKind_iterator byKindBegin( const ResObject::Kind & kind_r ) const
@@ -140,7 +140,7 @@
/**
* Handling additional conflicts. E.G. do not install anything which provides "foo":
*
- * \code
+ * \code75
* CapSet capset;
* capset.insert (CapFactory().parse( ResTraits<Package>::kind, "foo"));
*
Modified: branches/REFACTORING-10_3/libzypp/zypp/Resolvable.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/Resolvable.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/Resolvable.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/Resolvable.cc Thu Jun 21 12:09:24 2007
@@ -15,7 +15,6 @@
#include "zypp/detail/ResolvableImpl.h"
#include "zypp/ResObject.h"
-#include "zypp/Source.h"
using namespace std;
Modified: branches/REFACTORING-10_3/libzypp/zypp/SrcPackage.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/SrcPackage.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/SrcPackage.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/SrcPackage.cc Thu Jun 21 12:09:24 2007
@@ -10,7 +10,6 @@
*
*/
#include "zypp/SrcPackage.h"
-#include "zypp/source/SourceImpl.h"
#include "zypp/base/Exception.h"
using namespace std;
Modified: branches/REFACTORING-10_3/libzypp/zypp/VendorAttr.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/VendorAttr.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/VendorAttr.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/VendorAttr.cc Thu Jun 21 12:09:24 2007
@@ -25,6 +25,7 @@
#include "zypp/base/IOStream.h"
#include "zypp/base/String.h"
+#include "zypp/PathInfo.h"
#include "zypp/VendorAttr.h"
#include "zypp/ZYppFactory.h"
Modified: branches/REFACTORING-10_3/libzypp/zypp/ZYpp.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/ZYpp.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/ZYpp.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/ZYpp.cc Thu Jun 21 12:09:24 2007
@@ -81,9 +81,6 @@
//
///////////////////////////////////////////////////////////////////
- //SourceFeed_Ref ZYpp::sourceFeed() const
- //{ return _pimpl->sourceFeed(); }
-
void ZYpp::addResolvables (const ResStore& store, bool installed)
{
_pimpl->addResolvables (store, installed);
Modified: branches/REFACTORING-10_3/libzypp/zypp/ZYpp.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/ZYpp.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/ZYpp.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/ZYpp.h Thu Jun 21 12:09:24 2007
@@ -38,7 +38,6 @@
class ZYppFactory;
class ResPool;
class ResPoolProxy;
- class SourceFeed_Ref;
class ResStore;
class Locale;
class KeyRing;
@@ -72,9 +71,6 @@
*/
ResPoolProxy poolProxy() const;
- /** */
- //SourceFeed_Ref sourceFeed() const;
-
void addResolvables (const ResStore& store, bool installed = false);
void removeResolvables (const ResStore& store);
Modified: branches/REFACTORING-10_3/libzypp/zypp/ZYppCallbacks.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/ZYppCallbacks.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/ZYppCallbacks.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/ZYppCallbacks.h Thu Jun 21 12:09:24 2007
@@ -14,7 +14,7 @@
#include "zypp/Callback.h"
#include "zypp/Resolvable.h"
-#include "zypp/Source.h"
+#include "zypp/Repository.h"
#include "zypp/Pathname.h"
#include "zypp/Message.h"
#include "zypp/Url.h"
@@ -114,7 +114,7 @@
};
// progress for probing a source
- struct ProbeSourceReport : public callback::ReportBase
+ struct ProbeRepoReport : public callback::ReportBase
{
enum Action {
ABORT, // abort and return error
@@ -140,7 +140,7 @@
virtual Action problem( const Url &/*url*/, Error /*error*/, const std::string &/*description*/ ) { return ABORT; }
};
- struct SourceCreateReport : public callback::ReportBase
+ struct RepoCreateReport : public callback::ReportBase
{
enum Action {
ABORT, // abort and return error
@@ -174,7 +174,7 @@
{}
};
- struct SourceReport : public callback::ReportBase
+ struct RepoReport : public callback::ReportBase
{
enum Action {
ABORT, // abort and return error
@@ -189,18 +189,18 @@
INVALID // th source is invalid
};
- virtual void start( Source_Ref /*source*/, const std::string &/*task*/ ) {}
+ virtual void start( Repository /*source*/, const std::string &/*task*/ ) {}
virtual bool progress( int /*value*/ )
{ return true; }
virtual Action problem(
- Source_Ref /*source*/
+ Repository /*source*/
, Error /*error*/
, const std::string &/*description*/ )
{ return ABORT; }
virtual void finish(
- Source_Ref /*source*/
+ Repository /*source*/
, const std::string &/*task*/
, Error /*error*/
, const std::string &/*reason*/ )
@@ -236,7 +236,7 @@
};
virtual Action requestMedia(
- Source_Ref /*source*/
+ Repository /*source*/
, unsigned /*mediumNr*/
, Error /*error*/
, const std::string &/*description*/
Modified: branches/REFACTORING-10_3/libzypp/zypp/detail/PackageImplIf.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/detail/PackageImplIf.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/detail/PackageImplIf.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/detail/PackageImplIf.h Thu Jun 21 12:09:24 2007
@@ -21,7 +21,7 @@
#include "zypp/Changelog.h"
#include "zypp/DiskUsage.h"
#include "zypp/PackageKeyword.h"
-#include "zypp/source/PackageDelta.h"
+#include "zypp/repo/PackageDelta.h"
///////////////////////////////////////////////////////////////////
namespace zypp
Modified: branches/REFACTORING-10_3/libzypp/zypp/detail/ResObjectImplIf.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/detail/ResObjectImplIf.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/detail/ResObjectImplIf.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/detail/ResObjectImplIf.cc Thu Jun 21 12:09:24 2007
@@ -10,8 +10,6 @@
*
*/
#include "zypp/detail/ResObjectImplIf.h"
-#include "zypp/source/SourceImpl.h"
-#include "zypp/SourceFactory.h"
#include "zypp/Repository.h"
///////////////////////////////////////////////////////////////////
@@ -50,18 +48,12 @@
ByteCount ResObjectImplIf::archivesize() const
{ return ByteCount(); }
- Source_Ref ResObjectImplIf::source() const
- { return Source_Ref::noSource; }
-
Repository ResObjectImplIf::repository() const
{ return Repository::noRepository; }
unsigned ResObjectImplIf::mediaNr() const
{ return 0; }
- unsigned ResObjectImplIf::sourceMediaNr() const
- { return 0; }
-
bool ResObjectImplIf::installOnly() const
{ return false; }
@@ -71,9 +63,6 @@
Date ResObjectImplIf::installtime() const
{ return Date(); }
- ZmdId ResObjectImplIf::zmdid() const
- { return 0; }
-
/////////////////////////////////////////////////////////////////
} // namespace detail
///////////////////////////////////////////////////////////////////
Modified: branches/REFACTORING-10_3/libzypp/zypp/detail/ResObjectImplIf.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/detail/ResObjectImplIf.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/detail/ResObjectImplIf.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/detail/ResObjectImplIf.h Thu Jun 21 12:09:24 2007
@@ -18,7 +18,7 @@
#include "zypp/base/Deprecated.h"
#include "zypp/detail/ResImplTraits.h"
#include "zypp/detail/ResObjectFactory.h"
-
+#include "zypp/Repository.h"
#include "zypp/Locale.h"
#include "zypp/ByteCount.h"
#include "zypp/Date.h"
@@ -34,7 +34,6 @@
{ /////////////////////////////////////////////////////////////////
class Resolvable;
- class Source_Ref;
class Repository;
///////////////////////////////////////////////////////////////////
@@ -93,15 +92,6 @@
*/
virtual unsigned mediaNr() const PURE_VIRTUAL;
- /** Backlink to the source providing this. */
- virtual Source_Ref source() const PURE_VIRTUAL;
-
- /** Number of the source media that provides the data
- * required for installation. Zero, if no media access
- * is required.
- */
- virtual unsigned sourceMediaNr() const PURE_VIRTUAL;
-
/** */
virtual bool installOnly() const PURE_VIRTUAL;
@@ -110,9 +100,6 @@
/** Time of installation, or \c 0 */
virtual Date installtime() const;
-
- /** Id used inside ZMD */
- ZYPP_DEPRECATED virtual ZmdId zmdid() const PURE_VIRTUAL;
//@}
public:
Modified: branches/REFACTORING-10_3/libzypp/zypp/parser/IniParser.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/parser/IniParser.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/parser/IniParser.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/parser/IniParser.cc Thu Jun 21 12:09:24 2007
@@ -69,7 +69,7 @@
void IniParser::parse( const InputStream & input_r, const ProgressData::ReceiverFnc & progress )
{
boost::regex rxSection("^\\[(.+)\\]$");
- boost::regex rxKeyValue("^(.+)[[:space:]]*=[[:space:]]*(.+)$");
+ boost::regex rxKeyValue("^(.*[^[:space:]])[ [:space:]]*=[[:space:]]*(.+)$");
MIL << "Start parsing " << input_r << endl;
_inputname = input_r.name();
Modified: branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLSourceCacheParser.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLSourceCacheParser.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLSourceCacheParser.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLSourceCacheParser.cc Thu Jun 21 12:09:24 2007
@@ -18,7 +18,7 @@
#include
#include
#include
-
+#include "zypp/repo/RepoType.h"
#include "XMLSourceCacheParser.h"
using namespace std;
@@ -30,8 +30,8 @@
XMLSourceCacheParser::XMLSourceCacheParser()
{ }
- XMLSourceCacheParser::XMLSourceCacheParser(SourceInfo_Ptr &entry)
- : zypp::parser::XMLNodeIterator(entry)
+ XMLSourceCacheParser::XMLSourceCacheParser(RepoInfo_Ptr &entry)
+ : zypp::parser::XMLNodeIterator(entry)
{ }
@@ -47,11 +47,11 @@
}
// do the actual processing
- SourceInfo_Ptr
+ RepoInfo_Ptr
XMLSourceCacheParser::process(const xmlTextReaderPtr reader)
{
assert(reader);
- SourceInfo_Ptr dataPtr( new source::SourceInfo );
+ RepoInfo_Ptr dataPtr( new RepoInfo );
xmlNodePtr dataNode = xmlTextReaderExpand(reader);
assert(dataNode);
@@ -80,15 +80,7 @@
}
else if (name == "type")
{
- dataPtr->setType(_helper.content(child));
- }
- else if (name == "product-dir")
- {
- dataPtr->setPath(_helper.content(child));
- }
- else if (name == "cache-dir")
- {
- dataPtr->setCacheDir(_helper.content(child));
+ dataPtr->setType(repo::RepoType(_helper.content(child)));
}
else if (name == "alias")
{
@@ -96,7 +88,7 @@
}
else if (name == "url")
{
- dataPtr->setUrl(_helper.content(child));
+ dataPtr->addBaseUrl(_helper.content(child));
}
else
{
@@ -110,7 +102,7 @@
XMLSourceCacheParser::XMLSourceCacheParser(std::istream &is, const std::string &baseUrl)
- : zypp::parser::XMLNodeIterator(is, baseUrl, SOURCESCHEMA)
+ : zypp::parser::XMLNodeIterator(is, baseUrl, SOURCESCHEMA)
{
fetchNext();
}
Modified: branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLSourceCacheParser.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLSourceCacheParser.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLSourceCacheParser.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLSourceCacheParser.h Thu Jun 21 12:09:24 2007
@@ -13,7 +13,7 @@
#ifndef XMLSourceCacheParser_h
#define XMLSourceCacheParser_h
-#include
+#include
#include
#include
#include <list>
@@ -24,7 +24,7 @@
{
namespace xmlstore
{
- typedef shared_ptrsource::SourceInfo SourceInfo_Ptr;
+ typedef shared_ptr<RepoInfo> RepoInfo_Ptr;
/*
* Use this class as an iterator that produces, one after one,
@@ -46,18 +46,18 @@
* You can query the exit status with errorStatus().
*/
- class XMLSourceCacheParser : public zypp::parser::XMLNodeIterator
+ class XMLSourceCacheParser : public zypp::parser::XMLNodeIterator
{
public:
XMLSourceCacheParser(std::istream &is, const std::string &baseUrl);
XMLSourceCacheParser();
- XMLSourceCacheParser(SourceInfo_Ptr & entry);
+ XMLSourceCacheParser(RepoInfo_Ptr & entry);
virtual ~XMLSourceCacheParser();
private:
virtual bool isInterested(const xmlNodePtr nodePtr);
- virtual SourceInfo_Ptr process(const xmlTextReaderPtr reader);
- void parseSourceList(SourceInfo_Ptr dataPtr, xmlNodePtr node);
+ virtual RepoInfo_Ptr process(const xmlTextReaderPtr reader);
+ void parseSourceList(RepoInfo_Ptr dataPtr, xmlNodePtr node);
zypp::parser::LibXMLHelper _helper;
};
} // namespace parser
Modified: branches/REFACTORING-10_3/libzypp/zypp/pool/GetResolvablesToInsDel.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/pool/GetResolvablesToInsDel.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/pool/GetResolvablesToInsDel.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/pool/GetResolvablesToInsDel.cc Thu Jun 21 12:09:24 2007
@@ -225,15 +225,15 @@
if (!cobj)
continue;
- if ( ! cobj->sourceMediaNr() ) {
+ if ( ! cobj->mediaNr() ) {
XXX << "No media access required for " << *cit << endl;
order.setInstalled( *cit );
other_list.push_back( *cit );
continue;
}
- if ( cobj->source().numericId() == last_prio &&
- cobj->sourceMediaNr() == last_medianum ) {
+ if ( cobj->repository().numericId() == last_prio &&
+ cobj->mediaNr() == last_medianum ) {
// prefer packages on current media.
XXX << "Stay with current media " << *cit << endl;
last_list.push_back( *cit );
@@ -247,12 +247,12 @@
if ( order_r == ORDER_BY_MEDIANR )
{
- if ( cobj->sourceMediaNr() < best_medianum ) {
+ if ( cobj->mediaNr() < best_medianum ) {
best_list.clear(); // new best
- } else if ( cobj->sourceMediaNr() == best_medianum ) {
- if ( cobj->source().numericId() < best_prio ) {
+ } else if ( cobj->mediaNr() == best_medianum ) {
+ if ( cobj->repository().numericId() < best_prio ) {
best_list.clear(); // new best
- } else if ( cobj->source().numericId() == best_prio ) {
+ } else if ( cobj->repository().numericId() == best_prio ) {
XXX << "Add to best list " << *cit << endl;
best_list.push_back( *cit ); // same as best -> add
continue;
@@ -265,12 +265,12 @@
}
else // default: ORDER_BY_SOURCE
{
- if ( cobj->source().numericId() < best_prio ) {
+ if ( cobj->repository().numericId() < best_prio ) {
best_list.clear(); // new best
- } else if ( cobj->source().numericId() == best_prio ) {
- if ( cobj->sourceMediaNr() < best_medianum ) {
+ } else if ( cobj->repository().numericId() == best_prio ) {
+ if ( cobj->mediaNr() < best_medianum ) {
best_list.clear(); // new best
- } else if ( cobj->sourceMediaNr() == best_medianum ) {
+ } else if ( cobj->mediaNr() == best_medianum ) {
XXX << "Add to best list " << *cit << endl;
best_list.push_back( *cit ); // same as best -> add
continue;
@@ -285,10 +285,10 @@
if ( best_list.empty() )
{
- XXX << "NEW BEST LIST [S" << cobj->source().numericId() << ":" << cobj->sourceMediaNr()
+ XXX << "NEW BEST LIST [S" << cobj->repository().numericId() << ":" << cobj->mediaNr()
<< "] (last [S" << best_prio << ":" << best_medianum << "])" << endl;
- best_prio = cobj->source().numericId();
- best_medianum = cobj->sourceMediaNr();
+ best_prio = cobj->repository().numericId();
+ best_medianum = cobj->mediaNr();
// first package or new best
XXX << "Add to best list " << *cit << endl;
best_list.push_back( *cit );
Modified: branches/REFACTORING-10_3/libzypp/zypp/pool/PoolTraits.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/pool/PoolTraits.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/pool/PoolTraits.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/pool/PoolTraits.h Thu Jun 21 12:09:24 2007
@@ -17,13 +17,15 @@
#include "zypp/PoolItem.h"
#include "zypp/Capability.h"
-#include "zypp/CapAndItem.h"
#include "zypp/Dep.h"
#include "zypp/ResStatus.h"
///////////////////////////////////////////////////////////////////
namespace zypp
{ /////////////////////////////////////////////////////////////////
+
+ class CapAndItem;
+
///////////////////////////////////////////////////////////////////
namespace pool
{ /////////////////////////////////////////////////////////////////
@@ -77,7 +79,7 @@
typedef ItemContainerT::const_iterator byName_iterator;
// internal organization
- typedef std::list<CapAndItem> CapItemContainerT; // (why,who) pairs
+ typedef std::listzypp::CapAndItem CapItemContainerT; // (why,who) pairs
typedef std::mapstd::string,CapItemContainerT CapItemStoreT; // capability.index -> (why,who) pairs
typedef std::map DepCapItemContainerT; // Dep -> (capability.index -> (why,who) pairs)
Copied: branches/REFACTORING-10_3/libzypp/zypp/repo/Applydeltarpm.cc (from r5803, trunk/libzypp/zypp/source/Applydeltarpm.cc)
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/Applydeltarpm.cc?p2=branches/REFACTORING-10_3/libzypp/zypp/repo/Applydeltarpm.cc&p1=trunk/libzypp/zypp/source/Applydeltarpm.cc&r1=5803&r2=5818&rev=5818&view=diff
==============================================================================
--- trunk/libzypp/zypp/source/Applydeltarpm.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/Applydeltarpm.cc Thu Jun 21 12:09:24 2007
@@ -13,7 +13,7 @@
#include "zypp/base/Logger.h"
#include "zypp/base/String.h"
-#include "zypp/source/Applydeltarpm.h"
+#include "zypp/repo/Applydeltarpm.h"
#include "zypp/ExternalProgram.h"
#include "zypp/AutoDispose.h"
#include "zypp/PathInfo.h"
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/DeltaCandidates.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/DeltaCandidates.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/DeltaCandidates.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/DeltaCandidates.cc Thu Jun 21 12:09:24 2007
@@ -28,7 +28,7 @@
public:
- Impl( const std::set<Repository> & repos )
+ Impl( const std::list<Repository> & repos )
: repos(repos)
{
@@ -39,7 +39,7 @@
Impl * clone() const
{ return new Impl( *this ); }
- std::set<Repository> repos;
+ std::list<Repository> repos;
};
///////////////////////////////////////////////////////////////////
@@ -49,7 +49,7 @@
return str << "DeltaCandidates::Impl";
}
- DeltaCandidates::DeltaCandidates(const std::set<Repository> & repos)
+ DeltaCandidates::DeltaCandidates(const std::list<Repository> & repos)
: _pimpl( new Impl(repos) )
{}
@@ -61,7 +61,7 @@
std::list<PatchRpm> candidates;
// query all repos
- for ( std::set<Repository>::const_iterator it = _pimpl->repos.begin();
+ for ( std::list<Repository>::const_iterator it = _pimpl->repos.begin();
it != _pimpl->repos.end();
++it )
{
@@ -83,7 +83,7 @@
std::list<DeltaRpm> candidates;
// query all repos
- for ( std::set<Repository>::const_iterator it = _pimpl->repos.begin();
+ for ( std::list<Repository>::const_iterator it = _pimpl->repos.begin();
it != _pimpl->repos.end();
++it )
{
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/DeltaCandidates.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/DeltaCandidates.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/DeltaCandidates.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/DeltaCandidates.h Thu Jun 21 12:09:24 2007
@@ -11,7 +11,7 @@
#define ZYPP_REPO_DELTACANDIDATES_H
#include <iosfwd>
-#include <set>
+#include <list>
#include "zypp/base/PtrTypes.h"
#include "zypp/base/Function.h"
@@ -43,7 +43,7 @@
* \param repos Set of repositories providing patch and delta packages
* \param installed_callback Will be used to ask if a package is installed or not
*/
- DeltaCandidates( const std::set<Repository> & repos );
+ DeltaCandidates( const std::list<Repository> & repos );
/** Dtor */
~DeltaCandidates();
Copied: branches/REFACTORING-10_3/libzypp/zypp/repo/PackageDelta.cc (from r5803, trunk/libzypp/zypp/source/PackageDelta.cc)
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/PackageDelta.cc?p2=branches/REFACTORING-10_3/libzypp/zypp/repo/PackageDelta.cc&p1=trunk/libzypp/zypp/source/PackageDelta.cc&r1=5803&r2=5818&rev=5818&view=diff
==============================================================================
--- trunk/libzypp/zypp/source/PackageDelta.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/PackageDelta.cc Thu Jun 21 12:09:24 2007
@@ -13,7 +13,7 @@
#include "zypp/base/LogTools.h"
-#include "zypp/source/PackageDelta.h"
+#include "zypp/repo/PackageDelta.h"
using std::endl;
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/PackageProvider.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/PackageProvider.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/PackageProvider.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/PackageProvider.cc Thu Jun 21 12:09:24 2007
@@ -18,8 +18,8 @@
#include "zypp/Repository.h"
#include "zypp/repo/PackageProvider.h"
#include "zypp/repo/RepoProvideFile.h"
-#include "zypp/source/Applydeltarpm.h"
-#include "zypp/source/PackageDelta.h"
+#include "zypp/repo/Applydeltarpm.h"
+#include "zypp/repo/PackageDelta.h"
#include "zypp/detail/ImplConnect.h"
#include "zypp/RepoInfo.h"
@@ -228,8 +228,9 @@
Pathname destination( Pathname::dirname( delta ) / defRpmFileName( _package ) );
/* just to ease testing with non remote sources */
- if ( ! _package->source().remote() )
- destination = Pathname("/tmp") / defRpmFileName( _package );
+ // FIXME removed API
+ //if ( ! _package->source().remote() )
+ // destination = Pathname("/tmp") / defRpmFileName( _package );
/**/
if ( ! applydeltarpm::provide( delta, destination,
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/RepoProvideFile.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/RepoProvideFile.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/RepoProvideFile.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/RepoProvideFile.cc Thu Jun 21 12:09:24 2007
@@ -43,7 +43,7 @@
* We redirect the static report triggered from Repository::provideFile
* to feed the ProvideFilePolicy callbacks.
*/
- struct DownloadFileReportHack : public callback::ReceiveReportsource::SourceReport
+ struct DownloadFileReportHack : public callback::ReceiveReportsource::RepoReport
{
virtual bool progress( int value )
{
@@ -89,7 +89,7 @@
DownloadFileReportHack dumb;
dumb._redirect = bind( mem_fun_ref( &ProvideFilePolicy::progress ),
ref( policy_r ), _1 );
- callback::TempConnectsource::SourceReport temp( dumb );
+ callback::TempConnectsource::RepoReport temp( dumb );
Url url;
RepoInfo info = repo_r.info();
Copied: branches/REFACTORING-10_3/libzypp/zypp/repo/SUSEMediaVerifier.cc (from r5803, trunk/libzypp/zypp/source/SUSEMediaVerifier.cc)
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/SUSEMediaVerifier.cc?p2=branches/REFACTORING-10_3/libzypp/zypp/repo/SUSEMediaVerifier.cc&p1=trunk/libzypp/zypp/source/SUSEMediaVerifier.cc&r1=5803&r2=5818&rev=5818&view=diff
==============================================================================
--- trunk/libzypp/zypp/source/SUSEMediaVerifier.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/SUSEMediaVerifier.cc Thu Jun 21 12:09:24 2007
@@ -1,12 +1,12 @@
#include <fstream>
-#include "zypp/source/SUSEMediaVerifier.h"
+#include "zypp/repo/SUSEMediaVerifier.h"
using namespace std;
namespace zypp
{
-namespace source
+namespace repo
{
SUSEMediaVerifier::SUSEMediaVerifier(const std::string & vendor_r, const std::string & id_r, const media::MediaNr media_nr)
Copied: branches/REFACTORING-10_3/libzypp/zypp/repo/SUSEMediaVerifier.h (from r5803, trunk/libzypp/zypp/source/SUSEMediaVerifier.h)
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/SUSEMediaVerifier.h?p2=branches/REFACTORING-10_3/libzypp/zypp/repo/SUSEMediaVerifier.h&p1=trunk/libzypp/zypp/source/SUSEMediaVerifier.h&r1=5803&r2=5818&rev=5818&view=diff
==============================================================================
--- trunk/libzypp/zypp/source/SUSEMediaVerifier.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/SUSEMediaVerifier.h Thu Jun 21 12:09:24 2007
@@ -7,7 +7,7 @@
namespace zypp
{
- namespace source
+ namespace repo
{
class SUSEMediaVerifier : public zypp::media::MediaVerifierBase
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/AtomImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/AtomImpl.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/AtomImpl.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/AtomImpl.cc Thu Jun 21 12:09:24 2007
@@ -100,15 +100,6 @@
return Date();
}
-//////////////////////////////////////////
-// DEPRECATED
-//////////////////////////////////////////
-
-Source_Ref AtomImpl::source() const
-{
- return Source_Ref::noSource;
-}
-
unsigned AtomImpl::mediaNr() const
{
return 1;
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/AtomImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/AtomImpl.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/AtomImpl.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/AtomImpl.h Thu Jun 21 12:09:24 2007
@@ -43,7 +43,6 @@
virtual Date buildtime() const;
virtual Date installtime() const;
- virtual Source_Ref source() const;
virtual unsigned mediaNr() const;
virtual Repository repository() const;
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/MessageImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/MessageImpl.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/MessageImpl.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/MessageImpl.cc Thu Jun 21 12:09:24 2007
@@ -100,15 +100,6 @@
return Date();
}
-//////////////////////////////////////////
-// DEPRECATED
-//////////////////////////////////////////
-
-Source_Ref MessageImpl::source() const
-{
- return Source_Ref::noSource;
-}
-
unsigned MessageImpl::mediaNr() const
{
return 1;
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/MessageImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/MessageImpl.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/MessageImpl.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/MessageImpl.h Thu Jun 21 12:09:24 2007
@@ -43,7 +43,6 @@
virtual Date buildtime() const;
virtual Date installtime() const;
- virtual Source_Ref source() const;
virtual unsigned mediaNr() const;
// MESSAGE
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PackageImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PackageImpl.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PackageImpl.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PackageImpl.cc Thu Jun 21 12:09:24 2007
@@ -103,20 +103,6 @@
return Date();
}
-unsigned PackageImpl::repositoryMediaNr() const
-{
- return _repository->resolvableQuery().queryNumericAttribute( _id, "ResObject", "repositoryMediaNr" );
-}
-
-//////////////////////////////////////////
-// DEPRECATED
-//////////////////////////////////////////
-
-Source_Ref PackageImpl::source() const
-{
- return Source_Ref::noSource;
-}
-
unsigned PackageImpl::mediaNr() const
{
return 1;
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PackageImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PackageImpl.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PackageImpl.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PackageImpl.h Thu Jun 21 12:09:24 2007
@@ -42,10 +42,7 @@
virtual bool installOnly() const;
virtual Date buildtime() const;
virtual Date installtime() const;
-
- virtual Source_Ref source() const;
- virtual unsigned mediaNr() const;
-
+
// PACKAGE
virtual CheckSum checksum() const;
virtual std::string buildhost() const;
@@ -68,9 +65,9 @@
virtual std::liststd::string filenames() const;
/*virtual std::list<DeltaRpm> deltaRpms() const;
virtual std::list<PatchRpm> patchRpms() const;
- */
- virtual unsigned repositoryMediaNr() const;
-
+ */
+ virtual unsigned mediaNr() const;
+
virtual Repository repository() const;
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatchImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatchImpl.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatchImpl.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatchImpl.cc Thu Jun 21 12:09:24 2007
@@ -103,15 +103,6 @@
return Date();
}
-//////////////////////////////////////////
-// DEPRECATED
-//////////////////////////////////////////
-
-Source_Ref PatchImpl::source() const
-{
- return Source_Ref::noSource;
-}
-
unsigned PatchImpl::mediaNr() const
{
return 1;
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatchImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatchImpl.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatchImpl.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatchImpl.h Thu Jun 21 12:09:24 2007
@@ -43,7 +43,6 @@
virtual Date buildtime() const;
virtual Date installtime() const;
- virtual Source_Ref source() const;
virtual unsigned mediaNr() const;
// PATCH
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.cc Thu Jun 21 12:09:24 2007
@@ -103,15 +103,6 @@
return Date();
}
-//////////////////////////////////////////
-// DEPRECATED
-//////////////////////////////////////////
-
-Source_Ref PatternImpl::source() const
-{
- return Source_Ref::noSource;
-}
-
unsigned PatternImpl::mediaNr() const
{
return 1;
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.h Thu Jun 21 12:09:24 2007
@@ -43,7 +43,6 @@
virtual Date buildtime() const;
virtual Date installtime() const;
- virtual Source_Ref source() const;
virtual unsigned mediaNr() const;
// PATTERN
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.cc Thu Jun 21 12:09:24 2007
@@ -100,15 +100,6 @@
return Date();
}
-//////////////////////////////////////////
-// DEPRECATED
-//////////////////////////////////////////
-
-Source_Ref ProductImpl::source() const
-{
- return Source_Ref::noSource;
-}
-
unsigned ProductImpl::mediaNr() const
{
return 1;
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ProductImpl.h Thu Jun 21 12:09:24 2007
@@ -43,7 +43,6 @@
virtual Date buildtime() const;
virtual Date installtime() const;
- virtual Source_Ref source() const;
virtual unsigned mediaNr() const;
// PRODUCT
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ScriptImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ScriptImpl.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ScriptImpl.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ScriptImpl.cc Thu Jun 21 12:09:24 2007
@@ -100,15 +100,6 @@
return Date();
}
-//////////////////////////////////////////
-// DEPRECATED
-//////////////////////////////////////////
-
-Source_Ref ScriptImpl::source() const
-{
- return Source_Ref::noSource;
-}
-
unsigned ScriptImpl::mediaNr() const
{
return 1;
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ScriptImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ScriptImpl.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ScriptImpl.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/ScriptImpl.h Thu Jun 21 12:09:24 2007
@@ -43,7 +43,6 @@
virtual Date buildtime() const;
virtual Date installtime() const;
- virtual Source_Ref source() const;
virtual unsigned mediaNr() const;
// SCRIPT
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/SrcPackageImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/SrcPackageImpl.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/SrcPackageImpl.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/SrcPackageImpl.cc Thu Jun 21 12:09:24 2007
@@ -30,18 +30,18 @@
/** Default ctor
*/
-SrcPackageImpl::SrcPackageImpl (Source_Ref source_r)
- : _source (source_r)
+SrcPackageImpl::SrcPackageImpl (Repository repo)
+ : _repository(repo)
, _install_only(false)
, _size_installed(0)
, _size_archive(0)
, _data_loaded(false)
{}
-Source_Ref
-SrcPackageImpl::source() const
+Repository
+SrcPackageImpl::repository() const
{
- return _source;
+ return _repository;
}
/** Package summary */
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/SrcPackageImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/SrcPackageImpl.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/SrcPackageImpl.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/SrcPackageImpl.h Thu Jun 21 12:09:24 2007
@@ -11,7 +11,7 @@
#define CachedRepoSrcPackageImpl_H
#include "zypp/detail/PackageImpl.h"
-#include "zypp/Source.h"
+#include "zypp/Repository.h"
//#include
///////////////////////////////////////////////////////////////////
@@ -29,7 +29,7 @@
{
public:
- SrcPackageImpl( Source_Ref source_r );
+ SrcPackageImpl( Repository repo );
virtual TranslatedText summary() const;
virtual TranslatedText description() const;
@@ -38,12 +38,10 @@
virtual ByteCount archivesize() const;
virtual Pathname location() const;
virtual bool installOnly() const;
- virtual Source_Ref source() const;
virtual unsigned mediaNr() const;
virtual Vendor vendor() const;
protected:
- Source_Ref _source;
TranslatedText _summary;
TranslatedText _description;
PackageGroup _group;
@@ -55,6 +53,7 @@
ByteCount _size_archive;
bool _data_loaded;
+ Repository repo;
};
/////////////////////////////////////////////////////////////////
} // ns cached
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.cc Thu Jun 21 12:09:24 2007
@@ -104,16 +104,6 @@
return _media_nr;
}
-
-//////////////////////////////////////////
-// DEPRECATED
-//////////////////////////////////////////
-
-Source_Ref MessageImpl::source() const
-{
- return Source_Ref::noSource;
-}
-
unsigned MessageImpl::mediaNr() const
{
return 1;
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.h Thu Jun 21 12:09:24 2007
@@ -43,7 +43,6 @@
virtual Date buildtime() const;
virtual Date installtime() const;
- virtual Source_Ref source() const;
virtual unsigned mediaNr() const;
// MESSAGE
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PackageImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PackageImpl.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PackageImpl.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PackageImpl.h Thu Jun 21 12:09:24 2007
@@ -13,7 +13,6 @@
#define ZYPP_SOURCE_MEMORYPACKAGEIMPL_H
#include "zypp/detail/PackageImplIf.h"
-#include "zypp/Source.h"
#include "zypp/data/ResolvableData.h"
#include "zypp/DiskUsage.h"
#include "zypp/CheckSum.h"
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.h Thu Jun 21 12:09:24 2007
@@ -17,7 +17,6 @@
#include "zypp/CheckSum.h"
#include "zypp/CapSet.h"
#include "zypp/detail/ProductImplIf.h"
-#include "zypp/Source.h"
#include "zypp/data/ResolvableData.h"
#include "zypp/TranslatedText.h"
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ScriptImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ScriptImpl.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ScriptImpl.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ScriptImpl.h Thu Jun 21 12:09:24 2007
@@ -43,7 +43,6 @@
virtual Date buildtime() const;
virtual Date installtime() const;
- virtual Source_Ref source() const;
virtual unsigned mediaNr() const;
// SCRIPT
Copied: branches/REFACTORING-10_3/libzypp/zypp/repo/plaindir/PlaindirImpl.cc (from r5817, trunk/libzypp/zypp/source/plaindir/PlaindirImpl.cc)
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/plaindir/PlaindirImpl.cc?p2=branches/REFACTORING-10_3/libzypp/zypp/repo/plaindir/PlaindirImpl.cc&p1=trunk/libzypp/zypp/source/plaindir/PlaindirImpl.cc&r1=5817&r2=5818&rev=5818&view=diff
==============================================================================
--- trunk/libzypp/zypp/source/plaindir/PlaindirImpl.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/plaindir/PlaindirImpl.cc Thu Jun 21 12:09:24 2007
@@ -10,7 +10,8 @@
#include <iostream>
#include "zypp/base/Logger.h"
-#include "zypp/source/plaindir/PlaindirImpl.h"
+#include "zypp/repo/plaindir/PlaindirImpl.h"
+#include "zypp/PathInfo.h"
using std::endl;
using namespace std;
@@ -19,7 +20,7 @@
namespace zypp
{ /////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
-namespace source
+namespace repo
{ /////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
namespace plaindir
@@ -38,33 +39,24 @@
void PlaindirImpl::factoryInit()
{
- if ( ! ( (url().getScheme() == "file") || (url().getScheme() == "dir") ) )
- {
- ZYPP_THROW( Exception( "Plaindir only supports local paths, scheme [" + url().getScheme() + "] is not local" ) );
- }
-
- MIL << "Plaindir source initialized." << std::endl;
- MIL << " Url : " << url() << std::endl;
- MIL << " Path : " << path() << std::endl;
}
-void PlaindirImpl::createResolvables(Source_Ref source_r)
+void PlaindirImpl::createResolvables(Repository repo)
{
- Pathname thePath = Pathname(url().getPathName()) + path();
- MIL << "Going to read dir " << thePath << std::endl;
-
- extract_packages_from_directory( _store, thePath, selfSourceRef(), true );
+// Pathname thePath = Pathname(url().getPathName()) + path();
+// MIL << "Going to read dir " << thePath << std::endl;
+//
+// extract_packages_from_directory( _store, thePath, selfRepository(), true );
}
-int PlaindirImpl::extract_packages_from_directory (ResStore & store, const Pathname & path, Source_Ref source, bool recursive)
+int PlaindirImpl::extract_packages_from_directory (ResStore & store, const Pathname & path, Repository repo, bool recursive)
{
using target::rpm::RpmHeader;
-
Pathname filename;
PathInfo magic;
bool distro_magic, pkginfo_magic;
- DBG << "extract_packages_from_directory(.., " << path << ", " << source.alias() << ", " << recursive << ")" << endl;
+// DBG << "extract_packages_from_directory(.., " << path << ", " << repo.info().alias() << ", " << recursive << ")" << endl;
/*
Check for magic files that indicate how to treat the
@@ -101,12 +93,12 @@
PathInfo file_info( file_path );
if (recursive && file_info.isDir()) {
- extract_packages_from_directory( store, file_path, source, recursive );
+ extract_packages_from_directory( store, file_path, repo, recursive );
} else if (file_info.isFile() && file_path.extension() == ".rpm" ) {
RpmHeader::constPtr header = RpmHeader::readPackage( file_path, RpmHeader::NOSIGNATURE );
#warning FIX creation of Package from src.rpm header
- Package::Ptr package = target::rpm::RpmDb::makePackageFromHeader( header, NULL, *it, source );
+ Package::Ptr package = target::rpm::RpmDb::makePackageFromHeader( header, NULL, *it, repo );
if (package != NULL) {
DBG << "Adding package " << *package << endl;
store.insert( package );
Copied: branches/REFACTORING-10_3/libzypp/zypp/repo/plaindir/PlaindirImpl.h (from r5817, trunk/libzypp/zypp/source/plaindir/PlaindirImpl.h)
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/plaindir/PlaindirImpl.h?p2=branches/REFACTORING-10_3/libzypp/zypp/repo/plaindir/PlaindirImpl.h&p1=trunk/libzypp/zypp/source/plaindir/PlaindirImpl.h&r1=5817&r2=5818&rev=5818&view=diff
==============================================================================
--- trunk/libzypp/zypp/source/plaindir/PlaindirImpl.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/plaindir/PlaindirImpl.h Thu Jun 21 12:09:24 2007
@@ -6,24 +6,22 @@
| /_____||_| |_| |_| |
| |
\---------------------------------------------------------------------*/
-/** \file zypp/source/plaindir/PlaindirImpl.h
- *
-*/
-#ifndef ZYPP_SOURCE_PLAINDIR_PLAINDIRIMPL_H
-#define ZYPP_SOURCE_PLAINDIR_PLAINDIRIMPL_H
+
+#ifndef ZYPP_REPO_PLAINDIR_PLAINDIRIMPL_H
+#define ZYPP_REPO_PLAINDIR_PLAINDIRIMPL_H
#include <iosfwd>
#include
#include
-#include "zypp/source/SourceImpl.h"
+#include "zypp/repo/RepositoryImpl.h"
///////////////////////////////////////////////////////////////////
namespace zypp
{ /////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
- namespace source
+ namespace repo
{ /////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
namespace plaindir
@@ -34,7 +32,7 @@
// CLASS NAME : PlaindirImpl
//
/** */
- class PlaindirImpl : public SourceImpl
+ class PlaindirImpl : public repo::RepositoryImpl
{
public:
typedef intrusive_ptr<PlaindirImpl> Ptr;
@@ -61,9 +59,9 @@
* \throw EXCEPTION on fail
*/
virtual void factoryInit();
- virtual void createResolvables(Source_Ref source_r);
+ virtual void createResolvables(Repository repo);
- int extract_packages_from_directory (ResStore & store, const Pathname & path, Source_Ref source, bool recursive);
+ int extract_packages_from_directory (ResStore & store, const Pathname & path, Repository repo, bool recursive);
};
///////////////////////////////////////////////////////////////////
Modified: branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Resolver.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Resolver.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Resolver.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Resolver.cc Thu Jun 21 12:09:24 2007
@@ -192,9 +192,9 @@
//---------------------------------------------------------------------------
void
-Resolver::addSubscribedSource (Source_Ref source)
+Resolver::addSubscribedSource (Repository repo)
{
- _subscribed.insert(source);
+ _subscribed.insert(repo);
}
void
Modified: branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Resolver.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Resolver.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Resolver.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Resolver.h Thu Jun 21 12:09:24 2007
@@ -123,7 +123,7 @@
ResolverContext_Ptr _establish_context;
bool _timed_out;
- std::set _subscribed;
+ std::set<Repository> _subscribed;
Arch _architecture;
@@ -176,7 +176,7 @@
ResPool pool (void) const;
void setPool (const ResPool & pool) { _pool = pool; }
- void addSubscribedSource (Source_Ref source);
+ void addSubscribedSource (Repository source);
void addPoolItemToInstall (PoolItem_Ref item);
void addPoolItemsToInstallFromList (PoolItemList & rl);
Modified: branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverContext.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverContext.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverContext.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverContext.cc Thu Jun 21 12:09:24 2007
@@ -267,7 +267,7 @@
misc_info->setOtherPoolItem (otherItem);
if (NVRA(item.resolvable()) == NVRA(otherItem.resolvable())
&& status.isBySolver() && statusOtherItem.isBySolver()) {
- // If there has already been selected another item by the solver (e.g. from another source)
+ // If there has already been selected another item by the solver (e.g. from another repo)
// we will take that.
// Bug 224698
addInfo( misc_info );
@@ -302,7 +302,7 @@
priority = 0;
else {
#endif
- priority = getSourcePriority (item->source());
+ priority = getRepoPriority (item->repository());
// }
if (priority < _min_priority) _min_priority = priority;
@@ -350,7 +350,7 @@
misc_info->setOtherPoolItem (otherItem);
if (NVRA(item.resolvable()) == NVRA(otherItem.resolvable())
&& status.isBySolver() && statusOtherItem.isBySolver()) {
- // If there has already been selected another item by the solver (e.g. from another source)
+ // If there has already been selected another item by the solver (e.g. from another repo)
// we will take that.
// Bug 224698
addInfo( misc_info );
@@ -404,7 +404,7 @@
priority = 0;
else {
#endif
- priority = getSourcePriority (item->source());
+ priority = getRepoPriority (item->repository());
// }
if (priority < _min_priority) _min_priority = priority;
@@ -1751,11 +1751,13 @@
int
-ResolverContext::getSourcePriority (Source_Ref source) const
+ResolverContext::getRepoPriority (Repository repo) const
{
- if (source.subscribed())
- return source.priority();
- return source.priorityUnsubscribed();
+#warning fix repo priority
+ return 0;
+// if (repo.subscribed())
+// return repo.priority();
+// return repository.priorityUnsubscribed();
}
//---------------------------------------------------------------------------
@@ -1780,17 +1782,17 @@
void
ResolverContext::collectCompareInfo (int & cmpVersion, // Version compare of ACCUMULATED items
- int & cmpSource, // compare of Sources
+ int & cmpRepo, // compare of Repositories
ResolverContext_Ptr compareContext)
{
- Source_Ref userSource; // Source Id of items which have been selected by the user for installation
- // It is empty, if there are different sources
- bool differentUserSources = false;
- Source_Ref userSourceCompare; // Source Id of items which have been selected by the user for installation
- // It is empty, if there are different sources
- bool differentUserCompareSources = false;
- SourceCounter thisMap; // Map of to be installed sources with an item counter
- SourceCounter compareMap; // Map of to be installed sources with an item counter
+ Repository userRepo; // Repo Id of items which have been selected by the user for installation
+ // It is empty, if there are different repos
+ bool differentUserRepos = false;
+ Repository userRepoCompare; // Repo Id of items which have been selected by the user for installation
+ // It is empty, if there are different repos
+ bool differentUserCompareRepos = false;
+ RepositoryCounter thisMap; // Map of to be installed repositorys with an item counter
+ RepositoryCounter compareMap; // Map of to be installed repositorys with an item counter
PoolItemList installList = getMarked(1);
PoolItemList compareList = compareContext->getMarked(1);; // List of comparing items which has to be installed
@@ -1799,30 +1801,30 @@
for ( PoolItemList::const_iterator thisIt = installList.begin();
thisIt != installList.end(); thisIt++ )
{
- // evaluate, if the user selected packages (items) has the same source
+ // evaluate, if the user selected packages (items) has the same repository
ResStatus status = getStatus (*thisIt);
if (status.isByUser()
|| thisIt->status().isByUser())
{
- if (userSource == Source_Ref::noSource
- && !differentUserSources)
+ if (userRepo == Repository::noRepository
+ && !differentUserRepos)
{
- userSource = thisIt->resolvable()->source();
+ userRepo = thisIt->resolvable()->repository();
}
- else if (userSource != thisIt->resolvable()->source())
+ else if (userRepo != thisIt->resolvable()->repository())
{
- differentUserSources = true; // there are other items of other sources which have been set by the user
+ differentUserRepos = true; // there are other items of other repositorys which have been set by the user
}
}
// collecting relationship between channels and installed items
- if (thisMap.find (thisIt->resolvable()->source()) == thisMap.end()) {
- thisMap[thisIt->resolvable()->source()] = 1;
+ if (thisMap.find (thisIt->resolvable()->repository()) == thisMap.end()) {
+ thisMap[thisIt->resolvable()->repository()] = 1;
}
else {
- thisMap[thisIt->resolvable()->source()] += 1;
+ thisMap[thisIt->resolvable()->repository()] += 1;
}
- _XDEBUG ("Count of left " << thisIt->resolvable()->source() << ": " << thisMap[thisIt->resolvable()->source()] << " : " << *(thisIt->resolvable()));
+ _XDEBUG ("Count of left " << thisIt->resolvable()->repository() << ": " << thisMap[thisIt->resolvable()->repository()] << " : " << *(thisIt->resolvable()));
// Comparing versions
while (itCompare != compareList.end() )
@@ -1834,29 +1836,29 @@
// Testcase: freshen-tests/exercise-7f-test
// Testcase: freshen-tests/exercise-7-test
cmpVersion += thisIt->resolvable()->edition().compare( itCompare->resolvable()->edition());
- _XDEBUG ("Version: " << *(thisIt->resolvable()) << "[" << thisIt->resolvable()->source() << "]" << endl
+ _XDEBUG ("Version: " << *(thisIt->resolvable()) << "[" << thisIt->resolvable()->repository() << "]" << endl
<< " <--> " << endl
- << "Version: " << *(itCompare->resolvable()) << "[" << itCompare->resolvable()->source() << "]"
+ << "Version: " << *(itCompare->resolvable()) << "[" << itCompare->resolvable()->repository() << "]"
<< " --> cmpVersion : " << cmpVersion);
- // evaluate if the user selected packages (items) has the same source
- ResObject::constPtr sourceItem = itCompare->resolvable();
+ // evaluate if the user selected packages (items) has the same repository
+ ResObject::constPtr repositoryItem = itCompare->resolvable();
ResStatus compStatus = compareContext->getStatus(*itCompare);
if (compStatus.isByUser()
|| itCompare->status().isByUser())
{
- if (userSourceCompare == Source_Ref::noSource
- && !differentUserCompareSources)
- userSourceCompare = sourceItem->source();
- else if (userSourceCompare != sourceItem->source())
- differentUserCompareSources = true; // there are other items of other sources which have been set by the user
+ if (userRepoCompare == Repository::noRepository
+ && !differentUserCompareRepos)
+ userRepoCompare = repositoryItem->repository();
+ else if (userRepoCompare != repositoryItem->repository())
+ differentUserCompareRepos = true; // there are other items of other repositorys which have been set by the user
}
// collecting relationship between channels and installed items
- if (compareMap.find (sourceItem->source()) == compareMap.end())
- compareMap[sourceItem->source()] = 1;
+ if (compareMap.find (repositoryItem->repository()) == compareMap.end())
+ compareMap[repositoryItem->repository()] = 1;
else
- compareMap[sourceItem->source()] += 1;
- _XDEBUG ("Count of right " << sourceItem->source() << ": " << compareMap[sourceItem->source()] << " : " << *(itCompare->resolvable()));
+ compareMap[repositoryItem->repository()] += 1;
+ _XDEBUG ("Count of right " << repositoryItem->repository() << ": " << compareMap[repositoryItem->repository()] << " : " << *(itCompare->resolvable()));
itCompare++;
} else if (cmp > 0 )
itCompare++;
@@ -1867,66 +1869,66 @@
// comparing the rest of the other install list
while (itCompare != compareList.end() )
{
- // evaluate if the user selected packages (items) has the same source
- ResObject::constPtr sourceItem = itCompare->resolvable();
+ // evaluate if the user selected packages (items) has the same repository
+ ResObject::constPtr repositoryItem = itCompare->resolvable();
ResStatus compStatus = compareContext->getStatus(*itCompare);
if (compStatus.isByUser()
|| itCompare->status().isByUser())
{
- if (userSourceCompare == Source_Ref::noSource
- && !differentUserCompareSources)
- userSourceCompare = sourceItem->source();
- else if (userSourceCompare != sourceItem->source())
- differentUserCompareSources = true; // there are other items of other sources which have been set by the user
+ if (userRepoCompare == Repository::noRepository
+ && !differentUserCompareRepos)
+ userRepoCompare = repositoryItem->repository();
+ else if (userRepoCompare != repositoryItem->repository())
+ differentUserCompareRepos = true; // there are other items of other repositorys which have been set by the user
}
// collecting relationship between channels and installed items
- if (compareMap.find (sourceItem->source()) == compareMap.end())
- compareMap[sourceItem->source()] = 1;
+ if (compareMap.find (repositoryItem->repository()) == compareMap.end())
+ compareMap[repositoryItem->repository()] = 1;
else
- compareMap[sourceItem->source()] += 1;
- _XDEBUG ("Count of right" << sourceItem->source() << ": " << compareMap[sourceItem->source()] << " : "
+ compareMap[repositoryItem->repository()] += 1;
+ _XDEBUG ("Count of right" << repositoryItem->repository() << ": " << compareMap[repositoryItem->repository()] << " : "
<< *(itCompare->resolvable()));
itCompare++;
}
- // evaluate cmpSource
- cmpSource = 0;
+ // evaluate cmpRepo
+ cmpRepo = 0;
int cmpCompare = 0;
- if (!differentUserSources)
+ if (!differentUserRepos)
{
// user selected items which has to be installed has only one channel;
- // cmpSource = number of items of that channel
- cmpSource = thisMap[userSource];
+ // cmpRepo = number of items of that channel
+ cmpRepo = thisMap[userRepo];
}
- if (!differentUserCompareSources) {
+ if (!differentUserCompareRepos) {
// user selected items which has to be installed has only one channel;
// cmpCompare = number of items of that channel
- cmpCompare = compareMap[userSourceCompare];
+ cmpCompare = compareMap[userRepoCompare];
}
- _XDEBUG ("cmpSource = " << cmpSource << " ; cmpCompare = " << cmpCompare << " ; sizeof compareMap:" << compareMap.size());
+ _XDEBUG ("cmpRepo = " << cmpRepo << " ; cmpCompare = " << cmpCompare << " ; sizeof compareMap:" << compareMap.size());
if (compareMap.size() == 1
&& thisMap.size() == 1
- && userSource == userSourceCompare) {
- // We have only one source from which all items will be instaled.
+ && userRepo == userRepoCompare) {
+ // We have only one repository from which all items will be instaled.
// So we will regards the complete amount of installed/updated packages
// Testcase basic-exercises/exercise-14-test
- cmpSource = 0;
+ cmpRepo = 0;
} else {
// The solutions has different channels with user selected items.
// Take the solution with the greater account of items in this channel
// Testcase basic-exercises/exercise-solution-order-test
- cmpSource = cmpSource - cmpCompare;
+ cmpRepo = cmpRepo - cmpCompare;
}
- if (cmpSource == 0)
+ if (cmpRepo == 0)
{
// less amount of channels are better
- cmpSource = compareMap.size() - thisMap.size();
+ cmpRepo = compareMap.size() - thisMap.size();
}
- _XDEBUG ("End comparing two solutions-------- Version compare: " << cmpVersion << " Source compare: "<< cmpSource);
+ _XDEBUG ("End comparing two solutions-------- Version compare: " << cmpVersion << " Repo compare: "<< cmpRepo);
}
int
@@ -1937,16 +1939,16 @@
// collecting all data for comparing both resultion results
int cmpVersion = 0; // Version compare of ACCUMULATED items
- int cmpSource = 0; // compare of Sources
+ int cmpRepo = 0; // compare of Repos
- collectCompareInfo (cmpVersion, cmpSource, context);
+ collectCompareInfo (cmpVersion, cmpRepo, context);
if (_preferHighestVersion) {
// comparing versions
cmp = cmpVersion;
DBG << "Comparing versions returned :" << cmp << endl;
if (cmp == 0) {
// High numbers are good... we don't want solutions containing low-priority channels.
- // Source priority which has been set externally
+ // Repo priority which has been set externally
cmp = num_cmp (_min_priority, context->_min_priority);
DBG << "Comparing priority returned :" << cmp << endl;
if (cmp == 0) {
@@ -1954,9 +1956,9 @@
cmp = rev_num_cmp (churn_factor (this), churn_factor (context));
DBG << "Comparing churn_factor returned :" << cmp << endl;
if (cmp == 0) {
- // Comparing sources regarding the items which has to be installed
- cmp = cmpSource;
- DBG << "Comparing sources returned :" << cmp << endl;
+ // Comparing repositorys regarding the items which has to be installed
+ cmp = cmpRepo;
+ DBG << "Comparing repositorys returned :" << cmp << endl;
if (cmp == 0) {
// High numbers are bad. Bigger #s means more penalties.
cmp = rev_num_cmp (_other_penalties, context->_other_penalties);
@@ -1972,16 +1974,16 @@
DBG << "Comparing churn_factor returned :" << cmp << endl;
if (cmp == 0) {
// High numbers are good... we don't want solutions containing low-priority channels.
- // Source priority which has been set externally
+ // Repo priority which has been set externally
cmp = num_cmp (_min_priority, context->_min_priority);
DBG << "Comparing priority returned :" << cmp << endl;
if (cmp == 0) {
cmp = cmpVersion;
DBG << "Comparing versions returned :" << cmp << endl;
if (cmp == 0) {
- // Comparing sources regarding the items which has to be installed
- cmp = cmpSource;
- DBG << "Comparing sources returned :" << cmp << endl;
+ // Comparing repositorys regarding the items which has to be installed
+ cmp = cmpRepo;
+ DBG << "Comparing repositorys returned :" << cmp << endl;
if (cmp == 0) {
// High numbers are bad. Bigger #s means more penalties.
cmp = rev_num_cmp (_other_penalties, context->_other_penalties);
Modified: branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverContext.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverContext.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverContext.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverContext.h Thu Jun 21 12:09:24 2007
@@ -29,7 +29,7 @@
#include "zypp/ResPool.h"
#include "zypp/PoolItem.h"
#include "zypp/Capability.h"
-#include "zypp/Source.h"
+#include "zypp/Repository.h"
#include "zypp/solver/detail/Types.h"
#include "zypp/solver/detail/ResolverInfo.h"
@@ -48,7 +48,7 @@
typedef void (*MarkedPoolItemFn) (PoolItem_Ref item, const ResStatus & status, void *data);
typedef void (*MarkedPoolItemPairFn) (PoolItem_Ref item1, const ResStatus & status1, PoolItem_Ref item2, const ResStatus & status2, void *data);
typedef std::multimap IgnoreMap;
-typedef std::map SourceCounter;
+typedef std::map RepositoryCounter;
///////////////////////////////////////////////////////////////////
//
@@ -319,7 +319,7 @@
void spew (void);
void spewInfo (void) const;
- int getSourcePriority (Source_Ref source) const;
+ int getRepoPriority (Repository source) const;
};
///////////////////////////////////////////////////////////////////
Modified: branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverInfo.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverInfo.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverInfo.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverInfo.cc Thu Jun 21 12:09:24 2007
@@ -23,7 +23,7 @@
#include <sstream>
#include "zypp/solver/detail/ResolverInfo.h"
-#include "zypp/Source.h"
+#include "zypp/Repository.h"
#include "zypp/Capability.h"
#include "zypp/base/String.h"
#include "zypp/base/Gettext.h"
@@ -149,13 +149,13 @@
if (item->arch() != "") {
os << '.' << item->arch();
}
- Source_Ref s = item->source();
+ Repository s = item->repository();
if (s) {
- string alias = s.alias();
+ string alias = s.info().alias();
if (!alias.empty()
&& alias != "@system")
{
- os << '[' << s.alias() << ']';
+ os << '[' << s.info().alias() << ']';
}
}
return os.str();
Modified: branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverQueue.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverQueue.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverQueue.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverQueue.cc Thu Jun 21 12:09:24 2007
@@ -319,10 +319,10 @@
QueueItemInstall_Ptr install_qitem = dynamic_pointer_cast<QueueItemInstall>(new_qitem);
/* Penalties are negative priorities */
- int penalty;
- Source_Ref src = install_qitem->item()->source();
- penalty = - src.priority();
-
+#warning FIX priorities
+ int penalty = 0;
+ Repository repo = install_qitem->item()->repository();
+ //penalty = - src.priority();
install_qitem->setOtherPenalty (penalty);
}
@@ -375,12 +375,12 @@
if (qitem->isInstall() && qitem2->isInstall()) {
PoolItem_Ref r = (dynamic_pointer_cast<QueueItemInstall>(qitem))->item();
PoolItem_Ref r2 = (dynamic_pointer_cast<QueueItemInstall>(qitem2))->item();
- Source_Ref source = r->source();
- Source_Ref source2 = r2->source();
+ Repository repo1 = r->repository();
+ Repository repo2 = r2->repository();
int priority, priority2;
- priority = _context->getSourcePriority( source );
- priority2 = _context->getSourcePriority( source2 );
+ priority = _context->getRepoPriority( repo1 );
+ priority2 = _context->getRepoPriority( repo2 );
if (priority != priority2 && r->name() == r2->name()) {
if (r->edition().compare(r2->edition()) == 0
Modified: branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Testcase.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Testcase.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Testcase.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Testcase.cc Thu Jun 21 12:09:24 2007
@@ -222,7 +222,7 @@
zypp::base::LogControl::instance().logfile( "/var/log/YaST2/y2log" );
ResPool pool = resolver.pool();
- SourceTable sourceTable;
+ RepositoryTable repoTable;
PoolItemList items_to_install;
PoolItemList items_to_remove;
HelixResolvable system (dumpPath + "/solver-system.xml");
@@ -235,15 +235,15 @@
// system channel
system.addResolvable (res);
} else {
- // source channels
- ResObject::constPtr sourceItem = it->resolvable();
- Source_Ref source = sourceItem->source();
- if (sourceTable.find (source) == sourceTable.end()) {
- sourceTable[source] = new HelixResolvable(dumpPath + "/"
- + numstring(source.numericId())
+ // repo channels
+ ResObject::constPtr repoItem = it->resolvable();
+ Repository repo = repoItem->repository();
+ if (repoTable.find (repo) == repoTable.end()) {
+ repoTable[repo] = new HelixResolvable(dumpPath + "/"
+ + numstring(repo.numericId())
+ "-package.xml");
}
- sourceTable[source]->addResolvable (res);
+ repoTable[repo]->addResolvable (res);
}
if ( it->status().isToBeInstalled()
@@ -259,7 +259,7 @@
// writing control file "*-test.xml"
HelixControl control (dumpPath + "/solver-test.xml",
- sourceTable,
+ repoTable,
resolver.architecture());
for (PoolItemList::const_iterator iter = items_to_install.begin(); iter != items_to_install.end(); iter++) {
@@ -300,7 +300,7 @@
//---------------------------------------------------------------------------
HelixControl::HelixControl(const std::string & controlPath,
- const SourceTable & sourceTable,
+ const RepositoryTable & repoTable,
const Arch & systemArchitecture,
const std::string & systemPath)
:dumpFile (controlPath)
@@ -315,11 +315,11 @@
<< "<test>" << endl
<< "" << endl
<< TAB << "" << endl;
- for ( SourceTable::const_iterator it = sourceTable.begin();
- it != sourceTable.end(); ++it ) {
- Source_Ref source = it->first;
- *file << TAB << "first;
+ *file << TAB << "" << endl;
}
*file << "</setup>" << endl
@@ -343,8 +343,8 @@
void HelixControl::installResolvable(const ResObject::constPtr &resObject)
{
- Source_Ref source = resObject->source();
- *file << "kind().asString()) << "\""
+ Repository repo = resObject->repository();
+ *file << "kind().asString()) << "\""
<< " name=\"" << resObject->name() << "\"" << " arch=\"" << resObject->arch().asString() << "\""
<< " version=\"" << resObject->edition().version() << "\"" << " release=\"" << resObject->edition().release() << "\""
<< " edition=\"" << resObject->edition().asString() << "\"" << "/>" << endl;
@@ -352,7 +352,7 @@
void HelixControl::deleteResolvable(const ResObject::constPtr &resObject)
{
- Source_Ref source = resObject->source();
+ Repository repo = resObject->repository();
*file << "kind().asString()) << "\""
<< " name=\"" << resObject->name() << "\"" << "/>" << endl;
}
Modified: branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Testcase.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Testcase.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Testcase.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/solver/detail/Testcase.h Thu Jun 21 12:09:24 2007
@@ -76,7 +76,7 @@
};
DEFINE_PTR_TYPE(HelixResolvable);
-typedef std::map SourceTable;
+typedef std::map RepositoryTable;
///////////////////////////////////////////////////////////////////
//
@@ -93,7 +93,7 @@
public:
HelixControl (const std::string & controlPath,
- const SourceTable & sourceTable,
+ const RepositoryTable & sourceTable,
const Arch & systemArchitecture,
const std::string & systemPath = "solver-system.xml");
HelixControl ();
Modified: branches/REFACTORING-10_3/libzypp/zypp/target/CommitPackageCacheReadAhead.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/CommitPackageCacheReadAhead.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/target/CommitPackageCacheReadAhead.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/target/CommitPackageCacheReadAhead.cc Thu Jun 21 12:09:24 2007
@@ -13,7 +13,7 @@
#include "zypp/base/Logger.h"
#include "zypp/base/Exception.h"
-
+#include "zypp/PathInfo.h"
#include "zypp/target/CommitPackageCacheReadAhead.h"
using std::endl;
@@ -33,8 +33,8 @@
std::ostream & operator<<( std::ostream & str, const IMediaKey & obj )
{
- return str << "[S" << obj._source.numericId() << ":" << obj._mediaNr << "]"
- << " " << obj._source.alias();
+ return str << "[S" << obj._repository.numericId() << ":" << obj._mediaNr << "]"
+ << " " << obj._repository.info().alias();
}
///////////////////////////////////////////////////////////////////
@@ -64,10 +64,12 @@
//
bool CommitPackageCacheReadAhead::onInteractiveMedia( const PoolItem & pi ) const
{
- if ( pi->sourceMediaNr() == 0 ) // no media access at all
+ if ( pi->mediaNr() == 0 ) // no media access at all
return false;
- std::string scheme( pi->source().url().getScheme() );
- return ( scheme == "dvd" || scheme == "cd" );
+ //std::string scheme( pi->source().url().getScheme() );
+ //return ( scheme == "dvd" || scheme == "cd" );
+#warning "FIX CommitPackageCacheReadAhead::onInteractiveMedia"
+ return false;
}
///////////////////////////////////////////////////////////////////
@@ -158,8 +160,8 @@
// copy it to the cachedir
std::string destName( str::form( "S%lu_%u_%s",
- it->first->source().numericId(),
- it->first->sourceMediaNr(),
+ it->first->repository().numericId(),
+ it->first->mediaNr(),
fromSource.value().basename().c_str() ) );
ManagedFile fileInCache( _cacheDir->path() / destName,
Modified: branches/REFACTORING-10_3/libzypp/zypp/target/CommitPackageCacheReadAhead.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/CommitPackageCacheReadAhead.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/target/CommitPackageCacheReadAhead.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/target/CommitPackageCacheReadAhead.h Thu Jun 21 12:09:24 2007
@@ -18,7 +18,7 @@
#include "zypp/base/Exception.h"
#include "zypp/base/DefaultIntegral.h"
-#include "zypp/Source.h"
+#include "zypp/Repository.h"
#include "zypp/TmpPath.h"
#include "zypp/target/CommitPackageCacheImpl.h"
@@ -41,29 +41,29 @@
explicit
IMediaKey( const ResObject::constPtr & obj_r )
- : _source( obj_r->source() )
- , _mediaNr( obj_r->sourceMediaNr() )
+ : _repository( obj_r->repository() )
+ , _mediaNr( obj_r->mediaNr() )
{}
- IMediaKey( const Source_Ref & source_r, unsigned mediaNr_r )
- : _source( source_r )
+ IMediaKey( const Repository & repo, unsigned mediaNr_r )
+ : _repository( repo )
, _mediaNr( mediaNr_r )
{}
bool operator==( const IMediaKey & rhs ) const
- { return( _source == rhs._source && _mediaNr == rhs._mediaNr ); }
+ { return( _repository == rhs._repository && _mediaNr == rhs._mediaNr ); }
bool operator!=( const IMediaKey & rhs ) const
{ return ! operator==( rhs ); }
bool operator<( const IMediaKey & rhs ) const
{
- return( _source.numericId() < rhs._source.numericId()
- || ( _source.numericId() == rhs._source.numericId()
+ return( _repository.numericId() < rhs._repository.numericId()
+ || ( _repository.numericId() == rhs._repository.numericId()
&& _mediaNr < rhs._mediaNr ) );
}
- Source_Ref _source;
+ Repository _repository;
DefaultIntegral _mediaNr;
};
///////////////////////////////////////////////////////////////////
Modified: branches/REFACTORING-10_3/libzypp/zypp/target/TargetImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/TargetImpl.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/target/TargetImpl.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/target/TargetImpl.cc Thu Jun 21 12:09:24 2007
@@ -19,6 +19,8 @@
#include "zypp/base/Exception.h"
#include "zypp/base/Iterator.h"
#include "zypp/base/Gettext.h"
+#include "zypp/base/UserRequestException.h"
+
#include "zypp/PoolItem.h"
#include "zypp/Resolvable.h"
#include "zypp/ResObject.h"
@@ -27,7 +29,6 @@
#include "zypp/Selection.h"
#include "zypp/Script.h"
#include "zypp/Message.h"
-#include "zypp/Source.h"
#include "zypp/Url.h"
#include "zypp/CapMatchHelper.h"
@@ -41,12 +42,8 @@
#include "zypp/pool/GetResolvablesToInsDel.h"
#include "zypp/solver/detail/Helper.h"
-#ifdef ZYPP_REFACTORING
#include "zypp/repo/DeltaCandidates.h"
#include "zypp/repo/PackageProvider.h"
-#else
-#include "zypp/source/PackageProvider.h"
-#endif
using namespace std;
using namespace zypp;
@@ -226,26 +223,19 @@
/** Let the Source provide the package.
*/
- static ManagedFile sourceProvidePackage( const PoolItem & pi )
+ static ManagedFile repoProvidePackage( const PoolItem & pi )
{
// Redirect PackageProvider queries for installed editions
// (in case of patch/delta rpm processing) to rpmDb.
-#ifdef ZYPP_REFACTORING
repo::PackageProviderPolicy packageProviderPolicy;
-#else
- source::PackageProviderPolicy packageProviderPolicy;
-#endif
packageProviderPolicy.queryInstalledCB( QueryInstalledEditionHelper() );
Package::constPtr p = asKind<Package>(pi.resolvable());
-#ifdef ZYPP_REFACTORING
+
// FIXME no repo list
- std::set<Repository> repos;
+ std::list<Repository> repos;
repo::DeltaCandidates deltas(repos);
repo::PackageProvider pkgProvider( p, deltas, packageProviderPolicy );
-#else
- source::PackageProvider pkgProvider( p, packageProviderPolicy );
-#endif
return pkgProvider.providePackage();
}
@@ -432,7 +422,7 @@
ResObject::constPtr res( it->resolvable() );
if ( hitUnwantedMedia
- || ( res->sourceMediaNr() && res->sourceMediaNr() != policy_r.restrictToMedia() ) )
+ || ( res->mediaNr() && res->mediaNr() != policy_r.restrictToMedia() ) )
{
hitUnwantedMedia = true;
result._remaining.push_back( *it );
@@ -450,9 +440,9 @@
{
Resolvable::constPtr res( it->resolvable() );
Package::constPtr pkg( asKind<Package>(res) );
- if (pkg && policy_r.restrictToMedia() != pkg->sourceMediaNr()) // check medianr for packages only
+ if (pkg && policy_r.restrictToMedia() != pkg->mediaNr()) // check medianr for packages only
{
- XXX << "Package " << *pkg << ", wrong media " << pkg->sourceMediaNr() << endl;
+ XXX << "Package " << *pkg << ", wrong media " << pkg->mediaNr() << endl;
result._srcremaining.push_back( *it );
}
else
@@ -482,11 +472,11 @@
bool abort = false;
// remember the last used source (if any)
- Source_Ref lastUsedSource;
+ Repository lastUsedRepo;
// prepare the package cache.
CommitPackageCache packageCache( items_r.begin(), items_r.end(),
- root() / "tmp", sourceProvidePackage );
+ root() / "tmp", repoProvidePackage );
for (TargetImpl::PoolItemList::const_iterator it = items_r.begin(); it != items_r.end(); it++)
{
@@ -500,14 +490,14 @@
{
localfile = packageCache.get( it );
}
- catch ( const source::SkipRequestedException & e )
+ catch ( const SkipRequestException &e )
{
ZYPP_CAUGHT( e );
WAR << "Skipping package " << p << " in commit" << endl;
continue;
}
- lastUsedSource = p->source(); // remember the package source
+ lastUsedRepo = p->repository(); // remember the package source
#warning Exception handling
// create a installation progress report proxy
@@ -718,9 +708,9 @@
// In the case of 'commit any media', end of commit means we're completely
// done and don't need the source's media anyways.
- if (lastUsedSource)
+ if (lastUsedRepo)
{ // if a source was used
- lastUsedSource.release(); // release their medias
+ //lastUsedRepo.release(); // release their medias
}
if ( abort )
Modified: branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmDb.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmDb.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmDb.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmDb.cc Thu Jun 21 12:09:24 2007
@@ -1109,7 +1109,9 @@
// make Package::Ptr from RpmHeader
// return NULL on error
//
-Package::Ptr RpmDb::makePackageFromHeader( const RpmHeader::constPtr header, set<string> * filerequires, const Pathname & location, Source_Ref source )
+Package::Ptr RpmDb::makePackageFromHeader( const RpmHeader::constPtr header,
+ set<string> * filerequires,
+ const Pathname & location, Repository repo )
{
if ( ! header )
return 0;
@@ -1127,7 +1129,7 @@
// create dataprovider
detail::ResImplTraits<RPMPackageImpl>::Ptr impl( new RPMPackageImpl( header ) );
- impl->setSource( source );
+ impl->setRepository( repo );
if (!location.empty())
impl->setLocation( location );
@@ -1248,7 +1250,7 @@
continue;
}
- Package::Ptr pptr = makePackageFromHeader( *iter, &_filerequires, location, Source_Ref() );
+ Package::Ptr pptr = makePackageFromHeader( *iter, &_filerequires, location, Repository() );
if ( ! pptr )
{
WAR << "Failed to make package from database header '" << name << "'" << endl;
Modified: branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmDb.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmDb.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmDb.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmDb.h Thu Jun 21 12:09:24 2007
@@ -24,7 +24,6 @@
#include "zypp/ExternalProgram.h"
#include "zypp/Package.h"
-#include "zypp/Source.h"
#include "zypp/KeyRing.h"
#include "zypp/target/rpm/RpmHeader.h"
@@ -340,7 +339,9 @@
* return NULL on error
**/
- static Package::Ptr makePackageFromHeader( const RpmHeader::constPtr header, std::setstd::string * filerequires, const Pathname & location, Source_Ref source );
+ static Package::Ptr makePackageFromHeader( const RpmHeader::constPtr header,
+ std::setstd::string * filerequires,
+ const Pathname & location, Repository repo );
///////////////////////////////////////////////////////////////////
//
Modified: branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmPackageImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmPackageImpl.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmPackageImpl.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmPackageImpl.cc Thu Jun 21 12:09:24 2007
@@ -212,9 +212,9 @@
}
/** */
-Source_Ref RPMPackageImpl::source() const
+Repository RPMPackageImpl::repository() const
{
- return _source;
+ return _repository;
}
} // namespace rpm
Modified: branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmPackageImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmPackageImpl.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmPackageImpl.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/target/rpm/RpmPackageImpl.h Thu Jun 21 12:09:24 2007
@@ -13,7 +13,6 @@
#define ZYPP_TARGET_RPM_RPMPACKAGEIMPL_H
#include "zypp/detail/PackageImplIf.h"
-#include "zypp/Source.h"
#include "zypp/Changelog.h"
#include "zypp/target/rpm/RpmHeader.h"
@@ -91,16 +90,16 @@
/** */
virtual DiskUsage diskUsage() const;
/** */
- virtual Source_Ref source() const;
+ virtual Repository repository() const;
/** for 'local' RPMs */
void setLocation (const Pathname & pathname)
{
_location = pathname;
}
- void setSource (Source_Ref source)
+ void setRepository (Repository repo)
{
- _source = source;
+ _repository = repo;
}
protected:
@@ -121,7 +120,7 @@
DiskUsage _disk_usage;
ByteCount _size;
ByteCount _archivesize;
- Source_Ref _source;
+ Repository _repository;
};
///////////////////////////////////////////////////////////////////
} // namespace rpm
Modified: branches/REFACTORING-10_3/libzypp/zypp/target/store/Backend.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/store/Backend.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/target/store/Backend.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/target/store/Backend.h Thu Jun 21 12:09:24 2007
@@ -99,22 +99,6 @@
virtual std::setstd::string flags( const std::string &key ) const = 0;
virtual bool hasFlag( const std::string &key, const std::string &flag ) const = 0;
- /////////////////////////////////////////////////////////
- // SOURCES API
- ////////////////////////////////////////////////////////
- /**
- * Query for installed Sources
- */
- virtual source::SourceInfoList storedSources() const = 0;
- /**
- * Query for installed Sources
- */
- virtual void storeSource(const source::SourceInfo &data) = 0;
- /**
- * Query for installed Sources
- */
- virtual void deleteSource(const std::string &alias) = 0;
-
private:
/** Pointer to implementation */
class Private;
Modified: branches/REFACTORING-10_3/libzypp/zypp/target/store/PersistentStorage.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/store/PersistentStorage.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/target/store/PersistentStorage.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/target/store/PersistentStorage.cc Thu Jun 21 12:09:24 2007
@@ -165,28 +165,6 @@
return d->backend->hasFlag(key, flag);
}
-/////////////////////////////////////////////////////////
-// SOURCES API
-////////////////////////////////////////////////////////
-
-source::SourceInfoList
-PersistentStorage::storedSources() const
-{
- return d->backend->storedSources();
-}
-
-void
-PersistentStorage::storeSource(const source::SourceInfo &data)
-{
- d->backend->storeSource(data);
-}
-
-void
-PersistentStorage::deleteSource(const std::string &alias)
-{
- d->backend->deleteSource(alias);
-}
-
/******************************************************************
**
** FUNCTION NAME : operator<<
Modified: branches/REFACTORING-10_3/libzypp/zypp/target/store/PersistentStorage.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/store/PersistentStorage.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/target/store/PersistentStorage.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/target/store/PersistentStorage.h Thu Jun 21 12:09:24 2007
@@ -21,9 +21,6 @@
#include
#include
#include
-#include
-
-using namespace zypp::source;
///////////////////////////////////////////////////////////////////
namespace zypp
@@ -116,22 +113,6 @@
std::setstd::string flags( const std::string &key ) const;
bool hasFlag( const std::string &key, const std::string &flag ) const;
- /////////////////////////////////////////////////////////
- // SOURCES API
- ////////////////////////////////////////////////////////
- /**
- * Query for installed Sources
- */
- std::list<SourceInfo> storedSources() const;
- /**
- * Add a new installed source
- */
- void storeSource(const SourceInfo &data);
- /**
- * Delete an installed source
- */
- void deleteSource(const std::string &alias);
-
private:
class Private;
shared_ptr<Private> d;
Modified: branches/REFACTORING-10_3/libzypp/zypp/target/store/XMLFilesBackend.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/store/XMLFilesBackend.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/target/store/XMLFilesBackend.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/target/store/XMLFilesBackend.cc Thu Jun 21 12:09:24 2007
@@ -17,11 +17,9 @@
#include "zypp/base/Logger.h"
#include "zypp/base/Exception.h"
#include "zypp/base/Random.h"
-
+#include "zypp/base/Gettext.h"
#include "zypp/CapFactory.h"
#include "zypp/Digest.h"
-#include "zypp/Source.h"
-#include "zypp/SourceManager.h"
#include "zypp/ExternalProgram.h"
#include "zypp/target/store/xml/XMLPatchImpl.h"
@@ -49,8 +47,6 @@
#include
#include
-#include "zypp/parser/xmlstore/XMLSourceCacheParser.h"
-
#include "boost/filesystem/operations.hpp" // includes boost/filesystem/path.hpp
#include "boost/filesystem/fstream.hpp" // ditto
@@ -1343,93 +1339,6 @@
return str;
}
-/////////////////////////////////////////////////////////
-// SOURCES API
-////////////////////////////////////////////////////////
-
-source::SourceInfoList
-XMLFilesBackend::storedSources() const
-{
- path source_p = path(d->root.asString()) / path(ZYPP_DB_DIR) / path ("sources");
- source::SourceInfoList sources;
- DBG << "Reading source cache in " << source_p.string() << std::endl;
- directory_iterator end_iter;
- // return empty list if the dir does not exist
- if ( !exists( source_p ) )
- {
- ERR << "path " << source_p.string() << " does not exists. Required to read source cache " << std::endl;
- return source::SourceInfoList();
- }
-
- for ( directory_iterator dir_itr( source_p ); dir_itr != end_iter; ++dir_itr )
- {
- DBG << "[source-list] - " << dir_itr->leaf() << std::endl;
- //sources.insert( sourceDataFromCacheFile( source_p + "/" + dir_itr->leaf() ) );
- std::string full_path = (source_p / dir_itr->leaf()).string();
- std::ifstream anIstream(full_path.c_str());
- zypp::parser::xmlstore::XMLSourceCacheParser iter(anIstream, "");
- for (; ! iter.atEnd(); ++iter) {
- source::SourceInfo data = **iter;
- sources.push_back(data);
- }
- }
- MIL << "done reading source cache" << std::endl;
- return sources;
-
-}
-
-void
-XMLFilesBackend::storeSource(const source::SourceInfo &data)
-{
- // serialize and save a file
- std::string xml = toXML(data);
- path source_p = path(d->root.asString()) / path(ZYPP_DB_DIR) / path ("sources");
-
- // generate a filename
- if (data.alias().size() == 0)
- {
- ZYPP_THROW(Exception("Cant save source with empty alias"));
- }
-
- //DBG << std::endl << xml << std::endl;
- std::ofstream file;
- //DBG << filename << std::endl;
- try
- {
- std::stringstream message_stream(data.alias());
- std::string full_path = (source_p / Digest::digest("MD5", message_stream)).string();
-
- file.open(full_path.c_str());
- file << xml;
- file.close();
- }
- catch ( std::exception &e )
- {
- ERR << "Error saving source " << data.alias() << " in the cache" << std::endl;
- ZYPP_THROW(Exception(e.what()));
- }
- updateTimestamp();
-}
-
-void
-XMLFilesBackend::deleteSource(const std::string &alias)
-{
- // just delete the files
- path source_p = path(d->root.asString()) / path(ZYPP_DB_DIR) / path ("sources");
- try
- {
- std::stringstream message_stream(alias);
- std::string full_path = (source_p / Digest::digest("MD5", message_stream)).string();
- remove(full_path);
- }
- catch ( std::exception &e )
- {
- ERR << "Error deleting source " << alias << " in the cache" << std::endl;
- ZYPP_THROW(Exception(e.what()));
- }
- updateTimestamp();
-}
-
/////////////////////////////////////////////////////////////////
} // namespace storage
///////////////////////////////////////////////////////////////////
Modified: branches/REFACTORING-10_3/libzypp/zypp/target/store/XMLFilesBackend.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/store/XMLFilesBackend.h?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/target/store/XMLFilesBackend.h (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/target/store/XMLFilesBackend.h Thu Jun 21 12:09:24 2007
@@ -116,23 +116,6 @@
std::setstd::string flagsFromFile( const std::string &filename ) const;
void updateTimestamp() const;
- /////////////////////////////////////////////////////////
- // SOURCES API
- ////////////////////////////////////////////////////////
- public:
- /**
- * Query for installed Sources
- */
- virtual source::SourceInfoList storedSources() const;
- /**
- * Query for installed Sources
- */
- virtual void storeSource(const source::SourceInfo &data);
- /**
- * Query for installed Sources
- */
- virtual void deleteSource(const std::string &alias);
-
protected:
Modified: branches/REFACTORING-10_3/libzypp/zypp/target/store/serialize.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/store/serialize.cc?rev=5818&r1=5817&r2=5818&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/target/store/serialize.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/target/store/serialize.cc Thu Jun 21 12:09:24 2007
@@ -17,7 +17,6 @@
#include "zypp/base/Logger.h"
#include "zypp/CapFactory.h"
-#include "zypp/Source.h"
#include "zypp/Url.h"
#include "zypp/ResObject.h"
@@ -350,7 +349,7 @@
out << " <distribution-name>" << xml_escape(obj->distributionName()) << "</distribution-name>" << endl;
out << " <distribution-edition>" << xml_escape(obj->distributionEdition().asString()) << "</distribution-edition>" << endl;
- out << " <source>" << xml_escape(obj->source().alias()) << "</source>" << endl;
+ out << " <source>" << xml_escape(obj->repository().info().alias()) << "</source>" << endl;
out << " <release-notes-url>" << xml_escape(obj->releaseNotesUrl().asString()) << "</release-notes-url>" << endl;
out << " <update-urls>" << endl;
@@ -459,23 +458,6 @@
return out.str();
}
-template<>
-string toXML( const source::SourceInfo &obj )
-{
- stringstream out;
- out << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
- out << "