Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory
checked in at Mon Jun 28 10:44:46 CEST 2010.
--------
--- libzypp/libzypp.changes 2010-06-11 13:09:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2010-06-25 12:11:03.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jun 25 11:35:52 CEST 2010 - ma@suse.de
+
+- Don't bloat logfile by logging install progess values.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.JlWZO1/_old 2010-06-28 10:44:02.000000000 +0200
+++ /var/tmp/diff_new_pack.JlWZO1/_new 2010-06-28 10:44:02.000000000 +0200
@@ -24,7 +24,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Package, Patch, Pattern, and Product Management
Version: 7.7.5
-Release: 2
+Release: 3
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
Provides: yast2-packagemanager
++++++ libzypp-7.7.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.7.5/devel/devel.ma/Test.cc new/libzypp-7.7.5/devel/devel.ma/Test.cc
--- old/libzypp-7.7.5/devel/devel.ma/Test.cc 2010-06-11 12:51:02.000000000 +0200
+++ new/libzypp-7.7.5/devel/devel.ma/Test.cc 2010-06-25 12:08:27.000000000 +0200
@@ -5,7 +5,55 @@
#include
#include
-static TestSetup test( Arch_x86_64 ); // use x86_64 as system arch
+static const Pathname sysRoot( "/tmp/ToolScanRepos" );
+
+void addInstall( const std::string & pkgspec_r )
+{
+ bool rewrote( false );
+ Capability pkgspec( Capability::guessPackageSpec( pkgspec_r, rewrote ) );
+ MIL << "Add '" << pkgspec << "' for '" << pkgspec_r << "'" << endl;
+ ResPool::instance().resolver().addRequire( pkgspec );
+}
+
+void addConflict( const std::string & pkgspec_r )
+{
+ bool rewrote( false );
+ Capability pkgspec( Capability::guessPackageSpec( pkgspec_r, rewrote ) );
+ MIL << "Con '" << pkgspec << "' for '" << pkgspec_r << "'" << endl;
+ ResPool::instance().resolver().addConflict( pkgspec );
+}
+
+bool solve()
+{
+ bool rres = false;
+ {
+ //zypp::base::LogControl::TmpLineWriter shutUp;
+ //ResPool::instance().resolver().setOnlyRequires( true );
+ rres = ResPool::instance().resolver().resolvePool();
+ }
+ if ( ! rres )
+ {
+ ERR << "resolve " << rres << endl;
+ ResPool::instance().resolver().problems();
+ return false;
+ }
+ MIL << "resolve " << rres << endl;
+ vdumpPoolStats( USR << "Transacting:"<< endl,
+ make_filter_beginresfilter::ByTransact(ResPool::instance()),
+ make_filter_endresfilter::ByTransact(ResPool::instance()) ) << endl;
+
+ return true;
+}
+
+bool install()
+{
+ ZYppCommitPolicy pol;
+ pol.dryRun( true );
+ pol.rpmInstFlags( pol.rpmInstFlags().setFlag( target::rpm::RPMINST_JUSTDB ) );
+ SEC << getZYpp()->commit( pol ) << endl;
+ return true;
+}
+
/******************************************************************
**
@@ -15,39 +63,19 @@
int main( int argc, char * argv[] )
{
INT << "===[START]==========================================" << endl;
- test.loadRepo( "/Local/ROOT/cache/solv/@System/solv" );
-
- Match t( Match::REGEX );
-
- MIL << (t|Match::STRING) << endl;
- MIL << (t|Match::NOCASE) << endl;
- MIL << (Match::STRING|t) << endl;
- MIL << (Match::STRING|Match::NOCASE) << endl;
-
-
- Match m = Match::STRING | Match::NOCASE | Match::GLOB ;
- m = Match::NOCASE | Match::STRING;
- MIL << m << endl;
- MIL << m-Match::NOCASE << endl;
-
- MIL << Match(8765) << endl;
- MIL << Match() << endl;
-
-
- INT << "===[END]============================================" << endl << endl;
- return 0;
-
-
-
- PoolQuery q;
- q.addString("foo*|k?");
- q.setMatchRegex();
-
- for_( it, q.nbegin(), q.nend() )
- {
- zypp::PoolItem pi( zypp::ResPool::instance().find( *it ) );
- MIL << pi.resolvable() << endl;
- }
+ ///////////////////////////////////////////////////////////////////
+ if ( sysRoot == "/" )
+ ::unsetenv( "ZYPP_CONF" );
+ TestSetup::LoadSystemAt( sysRoot, Arch_x86_64 );
+ ///////////////////////////////////////////////////////////////////
+ ResPool pool( ResPool::instance() );
+ sat::Pool satpool( sat::Pool::instance() );
+ ///////////////////////////////////////////////////////////////////
+
+// addConflict( "kernel-default" );
+// addConflict( "kernel-default-base" );
+ addInstall( "test");
+ solve();
INT << "===[END]============================================" << endl << endl;
return 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.7.5/package/libzypp.changes new/libzypp-7.7.5/package/libzypp.changes
--- old/libzypp-7.7.5/package/libzypp.changes 2010-06-11 12:51:02.000000000 +0200
+++ new/libzypp-7.7.5/package/libzypp.changes 2010-06-25 12:08:28.000000000 +0200
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Fri Jun 25 11:35:52 CEST 2010 - ma@suse.de
+
+- Don't bloat logfile by logging install progess values.
+
+-------------------------------------------------------------------
Thu Jun 10 01:13:49 CEST 2010 - ma@suse.de
- Update zypp-po.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.7.5/tools/NameReqPrv.cc new/libzypp-7.7.5/tools/NameReqPrv.cc
--- old/libzypp-7.7.5/tools/NameReqPrv.cc 2010-06-11 12:51:02.000000000 +0200
+++ new/libzypp-7.7.5/tools/NameReqPrv.cc 2010-06-25 12:08:28.000000000 +0200
@@ -39,7 +39,7 @@
cerr << " -c/-C turn on/off looking for conflicts (default off)" << endl;
cerr << " -o/-O turn on/off looking for obsoletes (default off)" << endl;
cerr << " -m/-M turn on/off looking for recommends (default off)" << endl;
- cerr << " -s/-S turn on/off looking for suggests (default off)" << endl;
+ cerr << " -s/-S turn on/off looking for supplements (default off)" << endl;
cerr << " -a short for -n -p -r" << endl;
cerr << " -A short for -n -P -R" << endl;
cerr << "" << endl;
@@ -163,14 +163,14 @@
///////////////////////////////////////////////////////////////////
- bool ignorecase( true );
- bool names ( true );
- bool provides ( false );
- bool requires ( false );
- bool conflicts ( false );
- bool obsoletes ( false );
- bool recommends( false );
- bool suggests ( false );
+ bool ignorecase ( true );
+ bool names ( true );
+ bool provides ( false );
+ bool requires ( false );
+ bool conflicts ( false );
+ bool obsoletes ( false );
+ bool recommends ( false );
+ bool supplements ( false );
for ( ; argc; --argc,++argv )
{
@@ -194,8 +194,8 @@
case 'O': obsoletes = false; break;
case 'm': recommends = true; break;
case 'M': recommends = false; break;
- case 's': suggests = true; break;
- case 'S': suggests = false; break;
+ case 's': supplements = true; break;
+ case 'S': supplements = false; break;
}
continue;
}
@@ -235,12 +235,12 @@
q.addDependency( sat::SolvAttr::obsoletes );
if ( recommends )
q.addDependency( sat::SolvAttr::recommends );
- if ( suggests )
- q.addDependency( sat::SolvAttr::suggests );
+ if ( supplements )
+ q.addDependency( sat::SolvAttr::supplements );
}
message << *argv << " [" << (ignorecase?'i':'_') << (names?'n':'_') << (requires?'r':'_') << (provides?'p':'_')
- << (conflicts?'c':'_') << (obsoletes?'o':'_') << (recommends?'m':'_') << (suggests?'s':'_') << "] {" << endl;
+ << (conflicts?'c':'_') << (obsoletes?'o':'_') << (recommends?'m':'_') << (supplements?'s':'_') << "] {" << endl;
for_( it, q.begin(), q.end() )
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.7.5/zypp/Digest.cc new/libzypp-7.7.5/zypp/Digest.cc
--- old/libzypp-7.7.5/zypp/Digest.cc 2010-06-11 12:51:02.000000000 +0200
+++ new/libzypp-7.7.5/zypp/Digest.cc 2010-06-25 12:08:28.000000000 +0200
@@ -121,6 +121,7 @@
{
EVP_MD_CTX_cleanup(&mdctx);
initialized = false;
+ finalized = false;
}
}
@@ -150,6 +151,21 @@
return _dp->name;
}
+ bool Digest::reset()
+ {
+ if (!_dp->initialized)
+ return false;
+ if(!_dp->finalized)
+ {
+ (void)EVP_DigestFinal_ex(&_dp->mdctx, _dp->md_value, &_dp->md_len);
+ _dp->finalized = true;
+ }
+ if(!EVP_DigestInit_ex(&_dp->mdctx, _dp->md, NULL))
+ return false;
+ _dp->finalized = false;
+ return true;
+ }
+
std::string Digest::digest()
{
if(!_dp->maybeInit())
@@ -174,6 +190,24 @@
return std::string(mdtxt);
}
+ std::vector<unsigned char> Digest::digestVector()
+ {
+ std::vector<unsigned char> r;
+ if(!_dp->maybeInit())
+ return r;
+
+ if(!_dp->finalized)
+ {
+ if(!EVP_DigestFinal_ex(&_dp->mdctx, _dp->md_value, &_dp->md_len))
+ return r;
+ _dp->finalized = true;
+ }
+ r.reserve(_dp->md_len);
+ for(unsigned i = 0; i < _dp->md_len; ++i)
+ r.push_back(_dp->md_value[i]);
+ return r;
+ }
+
bool Digest::update(const char* bytes, size_t len)
{
if(!bytes)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.7.5/zypp/Digest.h new/libzypp-7.7.5/zypp/Digest.h
--- old/libzypp-7.7.5/zypp/Digest.h 2010-06-11 12:51:02.000000000 +0200
+++ new/libzypp-7.7.5/zypp/Digest.h 2010-06-25 12:08:28.000000000 +0200
@@ -17,6 +17,7 @@
#include <string>
#include <iosfwd>
+#include <vector>
#include
#include
@@ -101,6 +102,22 @@
* */
std::string digest();
+ /** \brief get vector of unsigned char representation of the digest
+ *
+ * this function will finalize the digest computation. calls to update
+ * after this function will start from scratch
+ *
+ * @return vector representation of the digest
+ * */
+ std::vector<unsigned char> digestVector();
+
+ /** \brief reset internal digest state
+ *
+ * this function is equivalent to calling create() with an unchanged name,
+ * but it may be implemented in a more efficient way.
+ */
+ bool reset();
+
/** \brief compute digest of a stream. convenience function
*
* calls create, update and digest in one function. The data for the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.7.5/zypp/target/rpm/RpmDb.cc new/libzypp-7.7.5/zypp/target/rpm/RpmDb.cc
--- old/libzypp-7.7.5/zypp/target/rpm/RpmDb.cc 2010-06-11 12:51:02.000000000 +0200
+++ new/libzypp-7.7.5/zypp/target/rpm/RpmDb.cc 2010-06-25 12:08:28.000000000 +0200
@@ -1497,9 +1497,6 @@
size_t linebuffer_size = 0;
char * linebuffer = 0;
ssize_t nread = getline( &linebuffer, &linebuffer_size, inputfile );
- DBG << "getline " << nread << " " << ::feof( inputfile ) << " " << ::ferror( inputfile ) << endl;
- if ( nread > 0 )
- DBG << " '" << string( linebuffer, nread ) << "'" << endl;
if ( nread == -1 )
{
if ( ::feof( inputfile ) )
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org