Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory
checked in at Wed Jun 9 17:29:26 CEST 2010.
--------
--- libzypp/libzypp.changes 2010-05-21 20:33:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2010-06-09 13:14:12.000000000 +0200
@@ -1,0 +2,31 @@
+Mon Jun 7 17:52:50 CEST 2010 - ma@suse.de
+
+- Add missing Date constant declarations.
+- version 7.7.5 (6)
+
+-------------------------------------------------------------------
+Mon Jun 7 11:46:58 CEST 2010 - ma@suse.de
+
+- Prevent against daemons launched in rpm %post, that do not close
+ their filedescriptors. Original fix was accidentally reverted.
+ (bnc#174548)
+- version 7.7.4 (6)
+
+-------------------------------------------------------------------
+Sun Jun 6 01:13:52 CEST 2010 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Fri Jun 4 17:14:17 CEST 2010 - ma@suse.de
+
+- Fix default evaluation of recommendations of installed
+ packages (bnc#605490)
+- version 7.7.3 (6)
+
+-------------------------------------------------------------------
+Thu Jun 3 01:14:08 CEST 2010 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libzypp-7.7.2.tar.bz2
New:
----
libzypp-7.7.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.a5I50N/_old 2010-06-09 17:20:43.000000000 +0200
+++ /var/tmp/diff_new_pack.a5I50N/_new 2010-06-09 17:20:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libzypp (Version 7.7.2)
+# spec file for package libzypp (Version 7.7.5)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,7 +23,7 @@
Group: System/Packages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Package, Patch, Pattern, and Product Management
-Version: 7.7.2
+Version: 7.7.5
Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
++++++ libzypp-7.7.2.tar.bz2 -> libzypp-7.7.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.7.2/VERSION.cmake new/libzypp-7.7.5/VERSION.cmake
--- old/libzypp-7.7.2/VERSION.cmake 2010-05-21 20:02:22.000000000 +0200
+++ new/libzypp-7.7.5/VERSION.cmake 2010-06-09 13:12:23.000000000 +0200
@@ -61,8 +61,8 @@
SET(LIBZYPP_MAJOR "7")
SET(LIBZYPP_COMPATMINOR "6")
SET(LIBZYPP_MINOR "7")
-SET(LIBZYPP_PATCH "2")
+SET(LIBZYPP_PATCH "5")
#
-# LAST RELEASED: 7.7.2 (6)
+# LAST RELEASED: 7.7.5 (6)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.7.2/devel/devel.ma/Test.cc new/libzypp-7.7.5/devel/devel.ma/Test.cc
--- old/libzypp-7.7.2/devel/devel.ma/Test.cc 2010-05-21 20:02:22.000000000 +0200
+++ new/libzypp-7.7.5/devel/devel.ma/Test.cc 2010-06-09 13:12:22.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.2/package/libzypp.changes new/libzypp-7.7.5/package/libzypp.changes
--- old/libzypp-7.7.2/package/libzypp.changes 2010-05-21 20:02:22.000000000 +0200
+++ new/libzypp-7.7.5/package/libzypp.changes 2010-06-09 13:12:23.000000000 +0200
@@ -1,4 +1,35 @@
-------------------------------------------------------------------
+Mon Jun 7 17:52:50 CEST 2010 - ma@suse.de
+
+- Add missing Date constant declarations.
+- version 7.7.5 (6)
+
+-------------------------------------------------------------------
+Mon Jun 7 11:46:58 CEST 2010 - ma@suse.de
+
+- Prevent against daemons launched in rpm %post, that do not close
+ their filedescriptors. Original fix was accidentally reverted.
+ (bnc#174548)
+- version 7.7.4 (6)
+
+-------------------------------------------------------------------
+Sun Jun 6 01:13:52 CEST 2010 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Fri Jun 4 17:14:17 CEST 2010 - ma@suse.de
+
+- Fix default evaluation of recommendations of installed
+ packages (bnc#605490)
+- version 7.7.3 (6)
+
+-------------------------------------------------------------------
+Thu Jun 3 01:14:08 CEST 2010 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
Fri May 21 20:00:55 CEST 2010 - ma@suse.de
- Fix broken IdStringType comparison (bnc#607572)
Files old/libzypp-7.7.2/po/zypp-po.tar.bz2 and new/libzypp-7.7.5/po/zypp-po.tar.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.7.2/zypp/Date.cc new/libzypp-7.7.5/zypp/Date.cc
--- old/libzypp-7.7.2/zypp/Date.cc 2010-05-21 20:02:22.000000000 +0200
+++ new/libzypp-7.7.5/zypp/Date.cc 2010-06-09 13:12:26.000000000 +0200
@@ -25,6 +25,19 @@
static std::string adjustLocale();
static void restoreLocale(const std::string & locale);
+ const Date::ValueType Date::second;
+ const Date::ValueType Date::minute;
+ const Date::ValueType Date::hour;
+ const Date::ValueType Date::day;
+ const Date::ValueType Date::month28;
+ const Date::ValueType Date::month29;
+ const Date::ValueType Date::month30;
+ const Date::ValueType Date::month31;
+ const Date::ValueType Date::month;
+ const Date::ValueType Date::year365;
+ const Date::ValueType Date::year366;
+ const Date::ValueType Date::year;
+
///////////////////////////////////////////////////////////////////
//
// METHOD NAME : Date::Date
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.7.2/zypp/solver/detail/Resolver.cc new/libzypp-7.7.5/zypp/solver/detail/Resolver.cc
--- old/libzypp-7.7.2/zypp/solver/detail/Resolver.cc 2010-05-21 20:02:22.000000000 +0200
+++ new/libzypp-7.7.5/zypp/solver/detail/Resolver.cc 2010-06-09 13:12:25.000000000 +0200
@@ -88,7 +88,7 @@
, _allowVendorChange ( ZConfig::instance().solver_allowVendorChange() )
, _solveSrcPackages ( false )
, _cleandepsOnRemove ( ZConfig::instance().solver_cleandepsOnRemove() )
- , _ignoreAlreadyRecommended (true)
+ , _ignoreAlreadyRecommended ( false )
{
sat::Pool satPool( sat::Pool::instance() );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.7.2/zypp/solver/detail/SATResolver.cc new/libzypp-7.7.5/zypp/solver/detail/SATResolver.cc
--- old/libzypp-7.7.2/zypp/solver/detail/SATResolver.cc 2010-05-21 20:02:22.000000000 +0200
+++ new/libzypp-7.7.5/zypp/solver/detail/SATResolver.cc 2010-06-09 13:12:25.000000000 +0200
@@ -145,7 +145,7 @@
, _noupdateprovide(false)
, _dosplitprovides(false)
, _onlyRequires(ZConfig::instance().solver_onlyRequires())
- , _ignorealreadyrecommended(true)
+ , _ignorealreadyrecommended(false)
, _distupgrade(false)
, _distupgrade_removeunsupported(false)
, _solveSrcPackages(false)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.7.2/zypp/target/rpm/RpmDb.cc new/libzypp-7.7.5/zypp/target/rpm/RpmDb.cc
--- old/libzypp-7.7.2/zypp/target/rpm/RpmDb.cc 2010-05-21 20:02:22.000000000 +0200
+++ new/libzypp-7.7.5/zypp/target/rpm/RpmDb.cc 2010-06-09 13:12:23.000000000 +0200
@@ -1459,23 +1459,76 @@
/*--------------------------------------------------------------*/
/* Read a line from the rpm process */
/*--------------------------------------------------------------*/
-bool
-RpmDb::systemReadLine(string &line)
+bool RpmDb::systemReadLine( string & line )
{
line.erase();
if ( process == NULL )
return false;
- line = process->receiveLine();
+ if ( process->inputFile() )
+ {
+ process->setBlocking( false );
+ FILE * inputfile = process->inputFile();
+ int inputfileFd = ::fileno( inputfile );
+ do
+ {
+ /* Watch inputFile to see when it has input. */
+ fd_set rfds;
+ FD_ZERO( &rfds );
+ FD_SET( inputfileFd, &rfds );
+
+ /* Wait up to 5 seconds. */
+ struct timeval tv;
+ tv.tv_sec = 5;
+ tv.tv_usec = 0;
+
+ int retval = select( inputfileFd+1, &rfds, NULL, NULL, &tv );
+
+ if ( retval == -1 )
+ {
+ ERR << "select error: " << strerror(errno) << endl;
+ if ( errno != EINTR )
+ return false;
+ }
+ else if ( retval )
+ {
+ // Data is available now.
+ 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 ) )
+ return line.size(); // in case of pending output
+ }
+ else
+ {
+ if ( nread > 0 )
+ {
+ if ( linebuffer[nread-1] == '\n' )
+ --nread;
+ line += string( linebuffer, nread );
+ }
+
+ if ( ! ::ferror( inputfile ) || ::feof( inputfile ) )
+ return true; // complete line
+ }
+ clearerr( inputfile );
+ }
+ else
+ {
+ // No data within time.
+ if ( ! process->running() )
+ return false;
+ }
+ } while ( true );
+ }
- if (line.length() == 0)
- return false;
-
- if (line[line.length() - 1] == '\n')
- line.erase(line.length() - 1);
-
- return true;
+ return false;
}
/*--------------------------------------------------------------*/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org