Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory
checked in at Fri Dec 5 15:44:22 CET 2008.
--------
--- libzypp/libzypp.changes 2008-12-01 19:46:26.000000000 +0100
+++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2008-12-05 14:29:46.898744000 +0100
@@ -1,0 +2,12 @@
+Fri Dec 5 14:22:11 CET 2008 - ma@suse.de
+
+- Fix solvers inappropriate selection as byUSER (bnc 455965)
+- revision 11891
+- version 5.24.6 (23)
+
+-------------------------------------------------------------------
+Thu Dec 4 11:10:35 CET 2008 - coolo@suse.de
+
+- fix %post script to not warn on fresh install
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libzypp-5.24.5.tar.bz2
New:
----
libzypp-5.24.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.p32070/_old 2008-12-05 15:42:46.000000000 +0100
+++ /var/tmp/diff_new_pack.p32070/_new 2008-12-05 15:42:46.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libzypp (Version 5.24.5)
+# spec file for package libzypp (Version 5.24.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,9 +24,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: on
Summary: Package, Patch, Pattern, and Product Management
-Version: 5.24.5
+Version: 5.24.6
Release: 1
-Source: libzypp-5.24.5.tar.bz2
+Source: libzypp-5.24.6.tar.bz2
Source1: libzypp-rpmlintrc
Prefix: /usr
Provides: yast2-packagemanager
@@ -76,7 +76,7 @@
%package devel
License: GPL v2 or later
-Requires: libzypp == 5.24.5
+Requires: libzypp == 5.24.6
Requires: libxml2-devel curl-devel openssl-devel rpm-devel glibc-devel zlib-devel
Requires: bzip2 popt-devel dbus-1-devel glib2-devel hal-devel boost-devel libstdc++-devel
Requires: cmake libsatsolver-devel >= 0.13.0
@@ -146,6 +146,7 @@
LOCKSFILE=/etc/zypp/locks
OLDLOCKSFILE=/etc/zypp/locks.old
is_old(){
+ test -f ${LOCKSFILE} || return 0
TEMP_FILE=`mktemp`
cat ${LOCKSFILE} | sed '/^\#.*/ d;/.*:.*/d;/^[^[a-zA-Z\*?.0-9]*$/d' > ${TEMP_FILE}
if [ -s ${TEMP_FILE} ]
@@ -233,6 +234,12 @@
%{_libdir}/pkgconfig/libzypp.pc
%changelog
+* Fri Dec 05 2008 ma@suse.de
+- Fix solvers inappropriate selection as byUSER (bnc 455965)
+- revision 11891
+- version 5.24.6 (23)
+* Thu Dec 04 2008 coolo@suse.de
+- fix %%post script to not warn on fresh install
* Mon Dec 01 2008 ma@suse.de
- Fix install order computation losing some installed packages
pre-requirements. (bnc #439802)
++++++ libzypp-5.24.5.tar.bz2 -> libzypp-5.24.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.5/devel/devel.ma/Test.cc new/libzypp-5.24.6/devel/devel.ma/Test.cc
--- old/libzypp-5.24.5/devel/devel.ma/Test.cc 2008-12-01 19:43:11.000000000 +0100
+++ new/libzypp-5.24.6/devel/devel.ma/Test.cc 2008-12-05 14:29:05.000000000 +0100
@@ -3,6 +3,22 @@
#include
+ static std::string pidAndAppname()
+ {
+ static std::string _val;
+ if ( _val.empty() )
+ {
+ pid_t mypid = getpid();
+ Pathname p( "/proc/"+str::numstring(mypid)+"/exe" );
+ Pathname myname( filesystem::readlink( p ) );
+
+ _val += str::numstring(mypid);
+ _val += ":";
+ _val += myname.basename();
+ }
+ return _val;
+ }
+
/******************************************************************
**
** FUNCTION NAME : main
@@ -12,6 +28,11 @@
{
INT << "===[START]==========================================" << endl;
+ SEC << pidAndAppname() << endl;
+
+
+ INT << "===[END]============================================" << endl << endl;
+ return 0;
Pathname mroot( "/tmp/Bb" );
TestSetup test( mroot, Arch_x86_64 );
test.loadRepo( "/Local/ROOT/cache/raw/11.1-update" );
@@ -36,6 +57,8 @@
MIL << it << endl;
}
+
+
INT << "===[END]============================================" << endl << endl;
return 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.5/libzypp.spec.cmake new/libzypp-5.24.6/libzypp.spec.cmake
--- old/libzypp-5.24.5/libzypp.spec.cmake 2008-12-01 19:43:11.000000000 +0100
+++ new/libzypp-5.24.6/libzypp.spec.cmake 2008-12-05 14:29:06.000000000 +0100
@@ -150,6 +150,7 @@
OLDLOCKSFILE=/etc/zypp/locks.old
is_old(){
+ test -f ${LOCKSFILE} || return 0
TEMP_FILE=`mktemp`
cat ${LOCKSFILE} | sed '/^\#.*/ d;/.*:.*/d;/^[^[a-zA-Z\*?.0-9]*$/d' > ${TEMP_FILE}
if [ -s ${TEMP_FILE} ]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.5/package/libzypp.changes new/libzypp-5.24.6/package/libzypp.changes
--- old/libzypp-5.24.5/package/libzypp.changes 2008-12-01 19:43:11.000000000 +0100
+++ new/libzypp-5.24.6/package/libzypp.changes 2008-12-05 14:29:06.000000000 +0100
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Fri Dec 5 14:22:11 CET 2008 - ma@suse.de
+
+- Fix solvers inappropriate selection as byUSER (bnc 455965)
+- revision 11891
+- version 5.24.6 (23)
+
+-------------------------------------------------------------------
+Thu Dec 4 11:10:35 CET 2008 - coolo@suse.de
+
+- fix %post script to not warn on fresh install
+
+-------------------------------------------------------------------
Mon Dec 1 19:38:24 CET 2008 - ma@suse.de
- Fix install order computation losing some installed packages
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.5/VERSION.cmake new/libzypp-5.24.6/VERSION.cmake
--- old/libzypp-5.24.5/VERSION.cmake 2008-12-01 19:43:11.000000000 +0100
+++ new/libzypp-5.24.6/VERSION.cmake 2008-12-05 14:29:06.000000000 +0100
@@ -61,8 +61,8 @@
SET(LIBZYPP_MAJOR "5")
SET(LIBZYPP_COMPATMINOR "23")
SET(LIBZYPP_MINOR "24")
-SET(LIBZYPP_PATCH "5")
+SET(LIBZYPP_PATCH "6")
#
-# LAST RELEASED: 5.24.5 (23)
+# LAST RELEASED: 5.24.6 (23)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.5/zypp/HistoryLog.cc new/libzypp-5.24.6/zypp/HistoryLog.cc
--- old/libzypp-5.24.5/zypp/HistoryLog.cc 2008-12-01 19:43:13.000000000 +0100
+++ new/libzypp-5.24.6/zypp/HistoryLog.cc 2008-12-05 14:29:06.000000000 +0100
@@ -47,6 +47,22 @@
}
return result;
}
+
+ static std::string pidAndAppname()
+ {
+ static std::string _val;
+ if ( _val.empty() )
+ {
+ pid_t mypid = getpid();
+ zypp::Pathname p( "/proc/"+zypp::str::numstring(mypid)+"/exe" );
+ zypp::Pathname myname( zypp::filesystem::readlink( p ) );
+
+ _val += zypp::str::numstring(mypid);
+ _val += ":";
+ _val += myname.basename();
+ }
+ return _val;
+ }
}
namespace zypp
@@ -239,10 +255,11 @@
<< _sep << p->edition() // 4 evr
<< _sep << p->arch(); // 5 arch
- if (pi.status().isByUser())
+ // ApplLow is what the solver selected on behalf of the user.
+ if (pi.status().isByUser() || pi.status().isByApplLow() )
_log << _sep << userAtHostname(); // 6 reqested by
- //else if (pi.status().isByApplHigh() || pi.status().isByApplLow())
- // _log << _sep << "appl";
+ else if (pi.status().isByApplHigh())
+ _log << _sep << pidAndAppname();
else
_log << _sep;
@@ -269,10 +286,11 @@
<< _sep << p->edition() // 4 evr
<< _sep << p->arch(); // 5 arch
- if (pi.status().isByUser())
+ // ApplLow is what the solver selected on behalf of the user.
+ if ( pi.status().isByUser() || pi.status().isByApplLow() )
_log << _sep << userAtHostname(); // 6 reqested by
- //else if (pi.status().isByApplHigh() || pi.status().isByApplLow())
- // _log << _sep << "appl";
+ else if (pi.status().isByApplHigh())
+ _log << _sep << pidAndAppname();
else
_log << _sep;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.5/zypp/solver/detail/SATResolver.cc new/libzypp-5.24.6/zypp/solver/detail/SATResolver.cc
--- old/libzypp-5.24.5/zypp/solver/detail/SATResolver.cc 2008-12-01 19:43:13.000000000 +0100
+++ new/libzypp-5.24.6/zypp/solver/detail/SATResolver.cc 2008-12-05 14:29:06.000000000 +0100
@@ -584,15 +584,15 @@
}
// Solvables which were selected due requirements which have been made by the user will
- // be selected by USER.
- // FIXME: The request queue should contains the TransactBy field
+ // be selected by APPL_LOW. We can't use any higher level, because this setting must
+ // not serve as a request for the next solver run. APPL_LOW is reset before solving.
for (CapabilitySet::const_iterator iter = requires_caps.begin(); iter != requires_caps.end(); iter++) {
sat::WhatProvides rpmProviders(*iter);
for_( iter2, rpmProviders.begin(), rpmProviders.end() ) {
PoolItem poolItem(*iter2);
if (poolItem.status().isToBeInstalled()) {
MIL << "User requirement " << *iter << " sets " << poolItem << endl;
- poolItem.status().setTransactByValue (ResStatus::USER);
+ poolItem.status().setTransactByValue (ResStatus::APPL_LOW);
}
}
}
@@ -602,7 +602,7 @@
PoolItem poolItem(*iter2);
if (poolItem.status().isToBeUninstalled()) {
MIL << "User conflict " << *iter << " sets " << poolItem << endl;
- poolItem.status().setTransactByValue (ResStatus::USER);
+ poolItem.status().setTransactByValue (ResStatus::APPL_LOW);
}
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org