Author: mlandres
Date: Fri Oct 17 16:42:22 2008
New Revision: 11394
URL: http://svn.opensuse.org/viewcvs/zypp?rev=11394&view=rev
Log:
backup
Added:
trunk/libzypp/devel/devel.ma/ToolScanRepos.cc (contents, props changed)
- copied, changed from r11389, trunk/libzypp/devel/devel.ma/ScanSource.cc
Removed:
trunk/libzypp/devel/devel.ma/ScanSource.cc
Modified:
trunk/libzypp/devel/devel.ma/CMakeLists.txt
trunk/libzypp/devel/devel.ma/Tools.h
Modified: trunk/libzypp/devel/devel.ma/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/CMakeLists.txt?rev=11394&r1=11393&r2=11394&view=diff
==============================================================================
--- trunk/libzypp/devel/devel.ma/CMakeLists.txt (original)
+++ trunk/libzypp/devel/devel.ma/CMakeLists.txt Fri Oct 17 16:42:22 2008
@@ -24,7 +24,7 @@
## ############################################################
-FOREACH( loop_var NewPool DumpSolv ScanSource Iorder Xml Ex Main FakePool AOUT Parse Test Basic Sat)
+FOREACH( loop_var MaTest NewPool DumpSolv Iorder Xml Ex Main FakePool AOUT Parse Test Basic Sat)
ADD_EXECUTABLE( ${loop_var}
${loop_var}.cc
)
@@ -34,13 +34,12 @@
ENDFOREACH( loop_var )
-FOREACH( loop_var MaTest )
+FOREACH( loop_var ToolScanRepos )
ADD_EXECUTABLE( ${loop_var}
${loop_var}.cc
)
TARGET_LINK_LIBRARIES( ${loop_var}
zypp
-#${QT_LIBRARIES}
)
ENDFOREACH( loop_var )
Copied: trunk/libzypp/devel/devel.ma/ToolScanRepos.cc (from r11389, trunk/libzypp/devel/devel.ma/ScanSource.cc)
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/ToolScanRepos.cc?p2=trunk/libzypp/devel/devel.ma/ToolScanRepos.cc&p1=trunk/libzypp/devel/devel.ma/ScanSource.cc&r1=11389&r2=11394&rev=11394&view=diff
==============================================================================
--- trunk/libzypp/devel/devel.ma/ScanSource.cc (original)
+++ trunk/libzypp/devel/devel.ma/ToolScanRepos.cc Fri Oct 17 16:42:22 2008
@@ -1,93 +1,4 @@
-#include <iostream>
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-using namespace std;
-using namespace zypp;
-
-static bool verbose = false;
-static bool debug = false;
-
-#define LOG (debug ? USR : cout)
-
-#include
-#include "zypp/source/PackageProvider.h"
-
- static void sourceProvidePackage( const ResObject::Ptr & pi )
- {
- // Redirect PackageProvider queries for installed editions
- // (in case of patch/delta rpm processing) to rpmDb.
- source::PackageProviderPolicy packageProviderPolicy;
- //packageProviderPolicy.queryInstalledCB( QueryInstalledEditionHelper() );
-
- Package::constPtr p = asKind<Package>(pi);
- if ( p )
- {
- source::PackageProvider pkgProvider( p, packageProviderPolicy );
- SEC << "++++" << endl;
- ManagedFile r( pkgProvider.providePackage() );
- SEC << "---" << endl;
- }
- SEC << "-" << endl;
- }
-
-struct KeyRingReceiver : public callback::ReceiveReport<KeyRingReport>
-{
- KeyRingReceiver()
- {
- connect();
- }
-
- virtual bool askUserToAcceptUnsignedFile( const std::string & file )
- {
- LOG << "===[UnsignedFile " << file << "]" << endl;
- return true;
- }
- virtual bool askUserToAcceptUnknownKey( const std::string &file,
- const std::string &id )
- {
- LOG << "===[UnknownKey " << id << "]" << endl;
- return true;
- }
- virtual bool askUserToTrustKey( const PublicKey &key)
- {
- LOG << "===[TrustKey" << key << "]" << endl;
- return true;
- }
- virtual bool askUserToImportKey( const PublicKey &key)
- {
- LOG << "===[ImportKey " << key << "]" << endl;
- return true;
- }
- virtual bool askUserToAcceptVerificationFailed( const std::string &file,
- const PublicKey &key )
- {
- LOG << "===[VerificationFailed " << file << " " << key << "]" << endl;
- return true;
- }
-};
-
-struct ResStoreStats : public pool::PoolStats
-{
- void operator()( const ResObject::constPtr & obj )
- {
- if ( isKind<Product>( obj ) )
- {
- LOG << obj << endl;
- }
- pool::PoolStats::operator()( obj );
- }
-};
+#include "Tools.h"
/******************************************************************
**
@@ -96,104 +7,29 @@
*/
int main( int argc, char * argv[] )
{
- //zypp::base::LogControl::instance().logfile( "" );
INT << "===[START]==========================================" << endl;
+ std::string appname( Pathname::basename( argv[0] ) );
--argc;
++argv;
if ( ! argc )
- {
- LOG << "Usage: ScanSource [options] url [[options] url...]" << endl;
- LOG << " Display summary of Sources found at 'url'. " << endl;
- LOG << " " << endl;
- LOG << " " << endl;
- LOG << " options:" << endl;
- LOG << " +/-l enable/disable detailed listing of Source content" << endl;
- LOG << " +/-d enable/disable debug output" << endl;
- return 0;
- }
-
- KeyRingReceiver accept;
-
- for ( ; argc; --argc, ++argv )
- {
- if ( *argv == string("+l") )
- {
- verbose = true;
- continue;
- }
- if ( *argv == string("-l") )
- {
- verbose = false;
- continue;
- }
- if ( *argv == string("+d") )
- {
- zypp::base::LogControl::instance().logfile( "-" );
- debug = true;
- continue;
- }
- if ( *argv == string("-d") )
- {
- zypp::base::LogControl::instance().logfile( "" );
- debug = false;
- continue;
- }
-
- LOG << "====================================================" << endl;
- LOG << "===Search Source at Url(" << *argv << ")..." << endl;
- Source_Ref src;
- try
- {
- Url url(*argv);
- try
- {
- src = SourceFactory().createFrom( url, "/", Date::now().asSeconds() );
- }
- catch ( const source::SourceUnknownTypeException & )
- {
- src = SourceFactory().createFrom( "Plaindir", url, "/", Date::now().asSeconds(), "", false, true );
- }
- }
- catch ( const Exception & except_r )
- {
- LOG << "***Failed: " << except_r << endl;
- continue;
- }
- LOG << "type: " << src.type() << endl;
- LOG << "numberOfMedia: " << src.numberOfMedia() << endl;
- LOG << "alias: " << src.alias() << endl;
- LOG << "vendor: " << src.vendor() << endl;
- LOG << "unique_id: " << src.unique_id() << endl;
- LOG << "baseSource: " << src.baseSource() << endl;
- LOG << "autorefresh: " << src.autorefresh() << endl;
- LOG << "publicKeys: " << src.publicKeys() << endl;
-
- LOG << "===Parse content..." << endl;
- try
- {
- src.resolvables();
- }
- catch ( const Exception & except_r )
- {
- LOG << "***Failed: " << except_r << endl;
- continue;
- }
- LOG << for_each( src.resolvables().begin(), src.resolvables().end(),
- ResStoreStats() ) << endl;
-
- for_each( src.resolvables().begin(),
- src.resolvables().end(),
- sourceProvidePackage );
-
- if ( verbose )
- {
- dumpRange( LOG, src.resolvables().begin(), src.resolvables().end() ) << endl;
- }
-
- //SourceManager::sourceManager()->addSource( src );
- //SourceManager::sourceManager()->store( "/", true );
- }
+ {
+ cerr << "Usage: " << appname << " URL..." << endl;
+ cerr << " Load repos from URL to test system below /tmp/" << appname << endl;
+ return 0;
+ }
+
+ Pathname mroot( "/tmp/"+appname );
+ filesystem::recursive_rmdir( mroot );
+ filesystem::assert_dir( mroot );
+ TestSetup test( mroot, Arch_x86_64 );
+
+ while ( argc )
+ {
+ test.loadRepo( Url( argv[0] ) );
+ --argc;
+ ++argv;
+ }
INT << "===[END]============================================" << endl << endl;
return 0;
Modified: trunk/libzypp/devel/devel.ma/Tools.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Tools.h?rev=11394&r1=11393&r2=11394&view=diff
==============================================================================
--- trunk/libzypp/devel/devel.ma/Tools.h (original)
+++ trunk/libzypp/devel/devel.ma/Tools.h Fri Oct 17 16:42:22 2008
@@ -12,7 +12,7 @@
#include "FakePool.h"
#define INCLUDE_TESTSETUP_WITHOUT_BOOST
-#include "zypp/../tests/include/TestSetup.h"
+#include "zypp/../tests/lib/TestSetup.h"
#undef INCLUDE_TESTSETUP_WITHOUT_BOOST
#include
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
