December 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <zypper> master : new file with translatable strings
by Ján Kupec 03 Dec '09

03 Dec '09

ref: refs/heads/master commit ce59ac01fdd9e49185386eb30b9c24a0ed2318c6 Author: Ján Kupec <jkupec(a)suse.cz> Date: Thu Dec 3 15:52:25 2009 +0100 new file with translatable strings --- po/POTFILES.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 4246ccc..d9dc664 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,6 +3,7 @@ # cat tmp | sort > POTFILES.in.new ../src/callbacks/keyring.h ../src/callbacks/locks.h +../src/callbacks/media.cc ../src/callbacks/media.h ../src/callbacks/repo.h ../src/callbacks/rpm.h -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp-bindings> master : Pass py_sitedir from .spec file to cmake.
by Michael Andres 03 Dec '09

03 Dec '09

ref: refs/heads/master commit fc6b5c9d4a93db816338386b56570b5da22f840e Author: Michael Andres <ma(a)suse.de> Date: Thu Dec 3 15:42:36 2009 +0100 Pass py_sitedir from .spec file to cmake. --- libzypp-bindings.spec.cmake | 1 + swig/python/CMakeLists.txt | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libzypp-bindings.spec.cmake b/libzypp-bindings.spec.cmake index a5fc442..39f4df1 100644 --- a/libzypp-bindings.spec.cmake +++ b/libzypp-bindings.spec.cmake @@ -31,6 +31,7 @@ This package provides bindings for libzypp, the library for package management. mkdir build cd build cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ + -DPYTHON_SITEDIR=%{py_sitedir} \ -DLIB=%{_lib} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt index 88b02ff..2542f5a 100644 --- a/swig/python/CMakeLists.txt +++ b/swig/python/CMakeLists.txt @@ -15,11 +15,13 @@ ADD_SUBDIRECTORY(tests) SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/satsolver_python.cc" ) FIND_PACKAGE(PythonInterp REQUIRED) -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(1))" OUTPUT_VARIABLE PYTHON_LIB_PATH) +IF (NOT PYTHON_SITEDIR) + EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(1))" OUTPUT_VARIABLE PYTHON_SITEDIR) +ENDIF (NOT PYTHON_SITEDIR) -MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}") -MESSAGE(STATUS "Python lib path: ${PYTHON_LIB_PATH}") +MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}") MESSAGE(STATUS "Python include path: ${PYTHON_INCLUDE_PATH}") +MESSAGE(STATUS "Python site dir: ${PYTHON_SITEDIR}") ADD_CUSTOM_COMMAND ( OUTPUT ${SWIG_OUTPUT} @@ -41,5 +43,5 @@ INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_PATH} ) INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} ) TARGET_LINK_LIBRARIES( zypp_python ${ZYPP_LIBRARY} ) -INSTALL(TARGETS zypp_python LIBRARY DESTINATION ${PYTHON_LIB_PATH}) -INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/zypp.py DESTINATION ${PYTHON_LIB_PATH}) +INSTALL(TARGETS zypp_python LIBRARY DESTINATION ${PYTHON_SITEDIR}) +INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/zypp.py DESTINATION ${PYTHON_SITEDIR}) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : Compute proper Selectable::pickStatus
by Michael Andres 03 Dec '09

03 Dec '09

ref: refs/heads/master commit fdac326bcab7425ca021d4910e4668bd3ff95d31 Author: Michael Andres <ma(a)suse.de> Date: Thu Dec 3 14:02:20 2009 +0100 Compute proper Selectable::pickStatus --- zypp/ui/SelectableImpl.cc | 71 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 70 insertions(+), 1 deletions(-) diff --git a/zypp/ui/SelectableImpl.cc b/zypp/ui/SelectableImpl.cc index 8a118ef..877d636 100644 --- a/zypp/ui/SelectableImpl.cc +++ b/zypp/ui/SelectableImpl.cc @@ -340,11 +340,80 @@ namespace zypp return pi_r.status().setTransact( yesno_r, causer_r ); } + /////////////////////////////////////////////////////////////////// + Status Selectable::Impl::pickStatus( const PoolItem & pi_r ) const { - return status(); + if ( pi_r.satSolvable().ident() == ident() ) + { + if ( pi_r.satSolvable().isSystem() ) + { + // have installed! + if ( pi_r.status().isLocked() ) + return S_Protected; + + // at least one identical available transacing? + for_( it, _availableItems.begin(), _availableItems.end() ) + { + if ( identical( *it, pi_r ) ) + { + if ( (*it).status().transacts() ) + return( (*it).status().isByUser() ? S_Update : S_AutoUpdate ); + } + } + + // no update, so maybe delete? + if ( pi_r.status().transacts() ) + return ( pi_r.status().isByUser() ? S_Del : S_AutoDel ); + + // keep + return S_KeepInstalled; + } + else + { + // have available! + if ( pi_r.status().isLocked() ) + return S_Taboo; + + // have identical installed? (maybe transacting): + PoolItem inst; + for_( it, _installedItems.begin(), _installedItems.end() ) + { + if ( identical( *it, pi_r ) ) + { + if ( (*it).status().transacts() ) + { + inst = *it; + break; + } + if ( !inst ) + inst = *it; + } + } + + // check for inst/update + if ( pi_r.status().transacts() ) + { + if ( inst ) + return( pi_r.status().isByUser() ? S_Update : S_AutoUpdate ); + else + return( pi_r.status().isByUser() ? S_Install : S_AutoInstall ); + } + + // no inst/update, so maybe delete? + if ( ! inst ) + return S_NoInst; + + if ( inst.status().transacts() ) + return( inst.status().isByUser() ? S_Del : S_AutoDel ); + + return S_KeepInstalled; + } + } + return Status(-1); // not my PoolItem } + /////////////////////////////////////////////////////////////////// ResStatus::TransactByValue Selectable::Impl::modifiedBy() const { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : Avoid null items in picklist
by Michael Andres 03 Dec '09

03 Dec '09

ref: refs/heads/master commit d34ec05cc261640694b9c186eb853a89bf18c2f5 Author: Michael Andres <ma(a)suse.de> Date: Thu Dec 3 12:43:35 2009 +0100 Avoid null items in picklist --- zypp/ui/SelectableImpl.h | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/zypp/ui/SelectableImpl.h b/zypp/ui/SelectableImpl.h index f8f1fd5..54bb1e8 100644 --- a/zypp/ui/SelectableImpl.h +++ b/zypp/ui/SelectableImpl.h @@ -253,7 +253,7 @@ namespace zypp { if ( ! _picklistPtr ) { - _picklistPtr.reset( new PickList( _availableItems.size() ) ); + _picklistPtr.reset( new PickList ); // installed without identical avaialble first: for_( it, _installedItems.begin(), _installedItems.end() ) { @@ -467,6 +467,31 @@ namespace zypp str << "} "; } + if ( obj.picklistEmpty() ) + { + str << "(P 0) {}"; + } + else + { + PoolItem cand( obj.candidateObj() ); + PoolItem up( obj.updateCandidateObj() ); + str << "(P " << obj.picklistSize() << ") {" << endl; + for_( it, obj.picklistBegin(), obj.picklistEnd() ) + { + char t = ' '; + if ( *it == cand ) + { + t = *it == up ? 'C' : 'c'; + } + else if ( *it == up ) + { + t = 'u'; + } + str << " " << t << " " << *it << "\t" << obj.pickStatus( *it ) << endl; + } + str << "} "; + } + return str; } ///////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : changes
by Ján Kupec 03 Dec '09

03 Dec '09

ref: refs/heads/master commit aeb6e781050eddc794831032bc5a8f07cd0b0945 Author: Ján Kupec <jkupec(a)suse.cz> Date: Thu Dec 3 12:15:13 2009 +0100 changes --- package/zypper.changes | 5 +++++ zypper.spec.cmake | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/package/zypper.changes b/package/zypper.changes index 6474efb..855feed 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Dec 3 12:13:19 CET 2009 - jkupec(a)suse.cz + +- Show truely all updates when --all is used (bnc #557557) + +------------------------------------------------------------------- Wed Dec 2 12:28:18 CET 2009 - jkupec(a)suse.cz - new prompt options for media errors: * cd/dvd: 'e' to eject selected drive (bnc #279045) diff --git a/zypper.spec.cmake b/zypper.spec.cmake index 908bcb4..aaea533 100644 --- a/zypper.spec.cmake +++ b/zypper.spec.cmake @@ -11,7 +11,7 @@ # norootforbuild Name: @PACKAGE@ -BuildRequires: libzypp-devel >= 6.21.4 boost-devel >= 1.33.1 gettext-devel >= 0.15 +BuildRequires: libzypp-devel >= 6.25.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 BuildRequires: readline-devel >= 5.1 augeas-devel >= 0.5.0 BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6 Requires: procps -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : Show truely all updates when --all is used (bnc #557557)
by Ján Kupec 03 Dec '09

03 Dec '09

ref: refs/heads/master commit 2be865178f8254073bcb29c4851aac97f8cbf313 Author: Ján Kupec <jkupec(a)suse.cz> Date: Thu Dec 3 12:12:34 2009 +0100 Show truely all updates when --all is used (bnc #557557) --- src/update.cc | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/update.cc b/src/update.cc index 7e84c9c..ca1ccf1 100755 --- a/src/update.cc +++ b/src/update.cc @@ -325,14 +325,18 @@ find_updates( const ResKind & kind, Candidates & candidates ) } + // get --all available updates, no matter if they are installable or break + // some current policy for_(it, pool.proxy().byKindBegin(kind), pool.proxy().byKindEnd(kind)) { if (!(*it)->hasInstalledObj()) continue; - PoolItem candidate = (*it)->updateCandidateObj(); + PoolItem candidate = (*it)->highestAvailableVersionObj(); // bnc #557557 if (!candidate) continue; + if (compareByNVRA((*it)->installedObj().resolvable(), candidate.resolvable()) >= 0) + continue; DBG << "selectable: " << **it << endl; DBG << "candidate: " << candidate << endl; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : changes 6.26.0
by Michael Andres 03 Dec '09

03 Dec '09

ref: refs/heads/master commit 51272a7f99e1236b71d4d085a89cbfcdd0b44f77 Author: Michael Andres <ma(a)suse.de> Date: Thu Dec 3 12:05:52 2009 +0100 changes 6.26.0 --- VERSION.cmake | 4 ++-- package/libzypp.changes | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 30038a3..85612d7 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "6") SET(LIBZYPP_COMPATMINOR "19") -SET(LIBZYPP_MINOR "25") +SET(LIBZYPP_MINOR "26") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 6.25.0 (19) +# LAST RELEASED: 6.26.0 (19) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index eafd90a..aa419a4 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Dec 3 12:00:16 CET 2009 - ma(a)suse.de + +- PickList and status interface for handling packages which are + installable in multiple versions. (fate #305311) +- version 6.26.0 (19) + +------------------------------------------------------------------- Wed Dec 2 13:10:43 CET 2009 - ma(a)suse.de - Add Selectable::highestAvailableVersionObj. Returns the highest -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : ui::Selectable: PickList and status interface for multiinstallable items.
by Michael Andres 03 Dec '09

03 Dec '09

ref: refs/heads/master commit 9ecf8d08d616bff334567649a3782d5916032a6e Author: Michael Andres <ma(a)suse.de> Date: Thu Dec 3 12:05:31 2009 +0100 ui::Selectable: PickList and status interface for multiinstallable items. --- zypp/ui/Selectable.cc | 16 ++++++++++++++++ zypp/ui/Selectable.h | 43 ++++++++++++++++++++++++++++++++++++++++++- zypp/ui/SelectableImpl.cc | 7 +++++++ zypp/ui/SelectableImpl.h | 37 ++++++++++++++++++++++++++++++++++++- zypp/ui/SelectableTraits.h | 6 +++++- 5 files changed, 106 insertions(+), 3 deletions(-) diff --git a/zypp/ui/Selectable.cc b/zypp/ui/Selectable.cc index 23e2e19..153c8d4 100644 --- a/zypp/ui/Selectable.cc +++ b/zypp/ui/Selectable.cc @@ -132,6 +132,19 @@ namespace zypp Selectable::installed_iterator Selectable::installedEnd() const { return _pimpl->installedEnd(); } + //////////////////////////////////////////////////////////////////////// + + bool Selectable::picklistEmpty() const + { return _pimpl->picklistEmpty(); } + + Selectable::picklist_size_type Selectable::picklistSize() const + { return _pimpl->picklistSize(); } + + Selectable::picklist_iterator Selectable::picklistBegin() const + { return _pimpl->picklistBegin(); } + + Selectable::picklist_iterator Selectable::picklistEnd() const + { return _pimpl->picklistEnd(); } //////////////////////////////////////////////////////////////////////// @@ -147,6 +160,9 @@ namespace zypp bool Selectable::pickDelete( const PoolItem & pi_r, ResStatus::TransactByValue causer_r, bool yesno_r ) { return _pimpl->pickDelete( pi_r, causer_r, yesno_r ); } + Status Selectable::pickStatus( const PoolItem & pi_r ) const + { return _pimpl->pickStatus( pi_r ); } + //////////////////////////////////////////////////////////////////////// bool Selectable::isUndetermined() const diff --git a/zypp/ui/Selectable.h b/zypp/ui/Selectable.h index 9be8a75..4826d7c 100644 --- a/zypp/ui/Selectable.h +++ b/zypp/ui/Selectable.h @@ -64,6 +64,9 @@ namespace zypp typedef SelectableTraits::installed_iterator installed_iterator; typedef SelectableTraits::installed_size_type installed_size_type; + typedef SelectableTraits::picklist_iterator picklist_iterator; + typedef SelectableTraits::picklist_size_type picklist_size_type; + public: /** \name Static ctor substitues picking the item from the pool. * \code @@ -233,7 +236,7 @@ namespace zypp //////////////////////////////////////////////////////////////////////// - /** \name Insatlled objects iterators. + /** \name Installed objects iterators. * Ordered by install time. Latest first. */ //@{ @@ -245,6 +248,19 @@ namespace zypp //////////////////////////////////////////////////////////////////////// + /** \name picklist iterators. + * This is basically the available items list prepended by those + * installed items, that are nolonger \ref identicalAvailable. + */ + //@{ + bool picklistEmpty() const; + picklist_size_type picklistSize() const; + picklist_iterator picklistBegin() const; + picklist_iterator picklistEnd() const; + //} + + //////////////////////////////////////////////////////////////////////// + public: /** \name Query for objects within this Selectable. */ @@ -309,6 +325,31 @@ namespace zypp */ bool pickNoDelete( const PoolItem & pi_r, ResStatus::TransactByValue causer_r = ResStatus::USER ) { return pickDelete( pi_r, causer_r, false ); } + + /** Compute the \ref ui::Status for an individual PoolItem. + * This just takes into account the item and any identical + * installed (or available) one. + * \code + * Assume there are 3 identical 'foo-1.1 (vendor A)' items, + * one 'foo-2.1 (vendor A)' and one ''foo-1.1 (vendor B)': + * + * installed: . foo-1.1 (vendor A) -> S_KeepInstalled + * available: foo-2.1 (vendor A) (repo 1) -> S_NoInst + * . foo-1.1 (vendor A) (repo 1) -> S_KeepInstalled + * . foo-1.1 (vendor A) (repo 2) -> S_KeepInstalled + * foo-1.1 (vendor B) (repo 3) -> S_NoInst + * + * After 'foo-1.1 (vendor A) (repo 1)' was selected to be installed: + * + * installed: . foo-1.1 (vendor A) -> S_Update + * available: foo-2.1 (vendor A) (repo 1) -> S_NoInst + * I foo-1.1 (vendor A) (repo 1) -> S_Update + * . foo-1.1 (vendor A) (repo 2) -> S_KeepInstalled + * foo-1.1 (vendor B) (repo 3) -> S_NoInst + * \endcode + * \see \ref sat::Solvable::identical + */ + Status pickStatus( const PoolItem & pi_r ) const; //@} /** \name Classification of available patches (pseudo installed items). diff --git a/zypp/ui/SelectableImpl.cc b/zypp/ui/SelectableImpl.cc index ab82c6a..8a118ef 100644 --- a/zypp/ui/SelectableImpl.cc +++ b/zypp/ui/SelectableImpl.cc @@ -323,6 +323,7 @@ namespace zypp return _candidate = newCandidate; } + bool Selectable::Impl::pickInstall( const PoolItem & pi_r, ResStatus::TransactByValue causer_r, bool yesno_r ) { if ( pi_r.satSolvable().ident() != ident() || pi_r.satSolvable().isSystem() ) @@ -339,6 +340,12 @@ namespace zypp return pi_r.status().setTransact( yesno_r, causer_r ); } + Status Selectable::Impl::pickStatus( const PoolItem & pi_r ) const + { + return status(); + } + + ResStatus::TransactByValue Selectable::Impl::modifiedBy() const { PoolItem cand( candidateObj() ); diff --git a/zypp/ui/SelectableImpl.h b/zypp/ui/SelectableImpl.h index 85ec1a3..f8f1fd5 100644 --- a/zypp/ui/SelectableImpl.h +++ b/zypp/ui/SelectableImpl.h @@ -52,6 +52,8 @@ namespace zypp typedef SelectableTraits::installed_const_iterator installed_const_iterator; typedef SelectableTraits::installed_size_type installed_size_type; + typedef SelectableTraits::PickList PickList; + public: template <class _Iterator> Impl( const ResObject::Kind & kind_r, @@ -247,6 +249,36 @@ namespace zypp //////////////////////////////////////////////////////////////////////// + const PickList & picklist() const + { + if ( ! _picklistPtr ) + { + _picklistPtr.reset( new PickList( _availableItems.size() ) ); + // installed without identical avaialble first: + for_( it, _installedItems.begin(), _installedItems.end() ) + { + if ( ! identicalAvailable( *it ) ) + _picklistPtr->push_back( *it ); + } + _picklistPtr->insert( _picklistPtr->end(), availableBegin(), availableEnd() ); + } + return *_picklistPtr; + } + + bool picklistEmpty() const + { return picklist().empty(); } + + picklist_size_type picklistSize() const + { return picklist().size(); } + + picklist_iterator picklistBegin() const + { return picklist().begin(); } + + picklist_iterator picklistEnd() const + { return picklist().end(); } + + //////////////////////////////////////////////////////////////////////// + bool isUnmaintained() const { return availableEmpty(); } @@ -257,6 +289,8 @@ namespace zypp bool pickDelete( const PoolItem & pi_r, ResStatus::TransactByValue causer_r, bool yesno_r ); + Status pickStatus( const PoolItem & pi_r ) const; + //////////////////////////////////////////////////////////////////////// bool isUndetermined() const @@ -368,9 +402,10 @@ namespace zypp AvailableItemSet _availableItems; //! Best among availabe with restpect to installed. PoolItem _defaultCandidate; - //! The object selected by setCandidateObj() method. PoolItem _candidate; + //! lazy initialized picklist + mutable scoped_ptr<PickList> _picklistPtr; }; /////////////////////////////////////////////////////////////////// diff --git a/zypp/ui/SelectableTraits.h b/zypp/ui/SelectableTraits.h index 298994f..9ad8102 100644 --- a/zypp/ui/SelectableTraits.h +++ b/zypp/ui/SelectableTraits.h @@ -13,6 +13,7 @@ #define ZYPP_UI_SELECTABLETRAITS_H #include <set> +#include <vector> #include "zypp/base/Iterator.h" #include "zypp/PoolItem.h" @@ -114,7 +115,10 @@ namespace zypp typedef AvailableItemSet::const_iterator installed_const_iterator; typedef AvailableItemSet::size_type installed_size_type; - }; + typedef std::vector<PoolItem> PickList; + typedef PickList::const_iterator picklist_iterator; + typedef PickList::size_type picklist_size_type; + }; /////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : Provide Selectable::identicalAvailable as counterpart to identicalInstalled.
by Michael Andres 02 Dec '09

02 Dec '09

ref: refs/heads/master commit 581be44031563236039dd1f16d147ddc5eb6a8e6 Author: Michael Andres <ma(a)suse.de> Date: Wed Dec 2 18:28:59 2009 +0100 Provide Selectable::identicalAvailable as counterpart to identicalInstalled. --- zypp/ui/Selectable.cc | 3 +++ zypp/ui/Selectable.h | 10 ++++++++-- zypp/ui/SelectableImpl.h | 20 ++++++++++++++++---- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/zypp/ui/Selectable.cc b/zypp/ui/Selectable.cc index 6283a17..23e2e19 100644 --- a/zypp/ui/Selectable.cc +++ b/zypp/ui/Selectable.cc @@ -82,6 +82,9 @@ namespace zypp PoolItem Selectable::highestAvailableVersionObj() const { return _pimpl->highestAvailableVersionObj(); } + bool Selectable::identicalAvailable( const PoolItem & rhs ) const + { return _pimpl->identicalAvailable( rhs ); } + bool Selectable::identicalInstalled( const PoolItem & rhs ) const { return _pimpl->identicalInstalled( rhs ); } diff --git a/zypp/ui/Selectable.h b/zypp/ui/Selectable.h index 875e086..9be8a75 100644 --- a/zypp/ui/Selectable.h +++ b/zypp/ui/Selectable.h @@ -147,8 +147,14 @@ namespace zypp */ PoolItem highestAvailableVersionObj() const; - /** \c True if \a rhs has the same content as an installed one. - * Basically the same name, edition, arch, vendor and buildtime. + /** \c True if \a rhs is installed and one with the same content is available. + * Basically the same name, edition, arch, vendor and buildtime. + * \see \ref sat::Solvable::identical + */ + bool identicalAvailable( const PoolItem & rhs ) const; + + /** \c True if \a rhs has the same content as an installed one. + * Basically the same name, edition, arch, vendor and buildtime. * \see \ref sat::Solvable::identical */ bool identicalInstalled( const PoolItem & rhs ) const; diff --git a/zypp/ui/SelectableImpl.h b/zypp/ui/SelectableImpl.h index ef71ef7..85ec1a3 100644 --- a/zypp/ui/SelectableImpl.h +++ b/zypp/ui/SelectableImpl.h @@ -168,7 +168,7 @@ namespace zypp return _defaultCandidate; } - /** \copydoc Selectable::highestAvailableVersionObj() */ + /** \copydoc Selectable::highestAvailableVersionObj()const */ PoolItem highestAvailableVersionObj() const { PoolItem ret; @@ -180,9 +180,21 @@ namespace zypp return ret; } - /** \c True if \a rhs has the same content as an installed one. - * \see \ref sat::Solvable::identical - */ + /** \copydoc Selectable::identicalAvailable( const PoolItem & )const */ + bool identicalAvailable( const PoolItem & rhs ) const + { + if ( !availableEmpty() && rhs ) + { + for_( it, _availableItems.begin(), _availableItems.end() ) + { + if ( identical( *it, rhs ) ) + return true; + } + } + return false; + } + + /** \copydoc Selectable::identicalInstalled( const PoolItem & )const */ bool identicalInstalled( const PoolItem & rhs ) const { if ( !installedEmpty() && rhs ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] Build failed in Hudson: zypper-head-x86_64 #6069
by Hudson Integration Service 02 Dec '09

02 Dec '09

See http://yast.suse.de:3334/job/zypper-head-x86_64/6069/changes Changes: [J??n Kupec] Don't force resolution in 'install' for non-package types (bnc #549940) [J??n Kupec] changes ------------------------------------------ [...truncated 29 lines...] -- The C compiler identification is GNU -- The CXX compiler identification is GNU -- Check for working C compiler: /opt/icecream/bin/gcc -- Check for working C compiler: /opt/icecream/bin/gcc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working CXX compiler: /opt/icecream/bin/g++ -- Check for working CXX compiler: /opt/icecream/bin/g++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Libraries will be installed in /usr/lib64 -- Config files will be installed in /etc ** Manual files will be installed in /usr/share/man -- Writing spec file... -- I hate you rpm-lint...!!! -- ZYpp path not set. Looking for it. -- ZYpp found: includes in /usr/include, library in /usr/lib64/libzypp.so -- readline found: includes in /usr/include, library in /usr/lib64/libreadline.so -- augeas found: includes in /usr/include, library in /usr/lib64/libaugeas.so ** Locale dir is /usr/share/locale ** ZYpper binary will be installed in /usr/bin -- Configuring done -- Generating done -- Build files have been written to: /build/zypper exit code: 0 ... good, lets continue Scanning dependencies of target srcpackage Scanning dependencies of target svncheck Built target svncheck Run CPack packaging tool for source... CPack: Create package using TBZ2 CPack: Install projects CPack: - Install directory: /src/zypper CPack: Compress package CPack: Finalize package CPack: Package /build/zypper/zypper-1.2.12.tar.bz2 generated. Built target srcpackage exit code: 0 ... good, lets continue exit code: 0 ... good, lets continue Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.GHqp9X + umask 022 + cd /tmp/rpmbuild + cd /tmp/rpmbuild + rm -rf zypper-1.2.12 + /usr/bin/bzip2 -dc /build/zypper/package/zypper-1.2.12.tar.bz2 + /bin/tar -xf - + STATUS=0 + '[' 0 -ne 0 ']' + cd zypper-1.2.12 + /bin/chmod -Rf a+rX,u+w,g-w,o-w . + exit 0 Executing(%build): /bin/sh -e /var/tmp/rpm-tmp.WwrL4J + umask 022 + cd /tmp/rpmbuild + /bin/rm -rf /usr/src/packages/BUILDROOT/zypper-1.2.12-0.x86_64 ++ dirname /usr/src/packages/BUILDROOT/zypper-1.2.12-0.x86_64 + /bin/mkdir -p /usr/src/packages/BUILDROOT + /bin/mkdir /usr/src/packages/BUILDROOT/zypper-1.2.12-0.x86_64 + cd zypper-1.2.12 + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc -DMANDIR=/usr/share/man -DCMAKE_VERBOSE_MAKEFILE=TRUE '-DCMAKE_C_FLAGS_RELEASE:STRING=-fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g' '-DCMAKE_CXX_FLAGS_RELEASE:STRING=-fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g' -DCMAKE_BUILD_TYPE=Release .. -- The C compiler identification is GNU -- The CXX compiler identification is GNU -- Check for working C compiler: /opt/icecream/bin/gcc -- Check for working C compiler: /opt/icecream/bin/gcc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working CXX compiler: /opt/icecream/bin/g++ -- Check for working CXX compiler: /opt/icecream/bin/g++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Libraries will be installed in /usr/lib64 -- Config files will be installed in /etc ** Manual files will be installed in /usr/share/man -- Writing spec file... -- I hate you rpm-lint...!!! -- ZYpp path not set. Looking for it. -- ZYpp found: includes in /usr/include, library in /usr/lib64/libzypp.so -- readline found: includes in /usr/include, library in /usr/lib64/libreadline.so -- augeas found: includes in /usr/include, library in /usr/lib64/libaugeas.so ** Locale dir is /usr/share/locale ** ZYpper binary will be installed in /usr/bin -- Configuring done -- Generating done -- Build files have been written to: /tmp/rpmbuild/zypper-1.2.12/build + make /usr/bin/cmake -H/tmp/rpmbuild/zypper-1.2.12 -B/tmp/rpmbuild/zypper-1.2.12/build --check-build-system CMakeFiles/Makefile.cmake 0 /usr/bin/cmake -E cmake_progress_start /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles/progress.make make -f CMakeFiles/Makefile2 all make[1]: Entering directory `/tmp/rpmbuild/zypper-1.2.12/build' make -f src/CMakeFiles/zypp-refresh.dir/build.make src/CMakeFiles/zypp-refresh.dir/depend make[2]: Entering directory `/tmp/rpmbuild/zypper-1.2.12/build' cd /tmp/rpmbuild/zypper-1.2.12/build && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/rpmbuild/zypper-1.2.12 /tmp/rpmbuild/zypper-1.2.12/src /tmp/rpmbuild/zypper-1.2.12/build /tmp/rpmbuild/zypper-1.2.12/build/src /tmp/rpmbuild/zypper-1.2.12/build/src/CMakeFiles/zypp-refresh.dir/DependInfo.cmake --color= Scanning dependencies of target zypp-refresh make[2]: Leaving directory `/tmp/rpmbuild/zypper-1.2.12/build' make -f src/CMakeFiles/zypp-refresh.dir/build.make src/CMakeFiles/zypp-refresh.dir/build make[2]: Entering directory `/tmp/rpmbuild/zypper-1.2.12/build' /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 1 [ 1%] Building CXX object src/CMakeFiles/zypp-refresh.dir/zypp-refresh.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypp-refresh.dir/zypp-refresh.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/zypp-refresh.cc Linking CXX executable zypp-refresh cd /tmp/rpmbuild/zypper-1.2.12/build/src && /usr/bin/cmake -E cmake_link_script CMakeFiles/zypp-refresh.dir/link.txt --verbose=1 /opt/icecream/bin/g++ -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -fPIC CMakeFiles/zypp-refresh.dir/zypp-refresh.cc.o -o zypp-refresh -rdynamic -lzypp make[2]: Leaving directory `/tmp/rpmbuild/zypper-1.2.12/build' /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 1 [ 1%] Built target zypp-refresh make -f src/CMakeFiles/zypp-refresh-wrapper.dir/build.make src/CMakeFiles/zypp-refresh-wrapper.dir/depend make[2]: Entering directory `/tmp/rpmbuild/zypper-1.2.12/build' cd /tmp/rpmbuild/zypper-1.2.12/build && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/rpmbuild/zypper-1.2.12 /tmp/rpmbuild/zypper-1.2.12/src /tmp/rpmbuild/zypper-1.2.12/build /tmp/rpmbuild/zypper-1.2.12/build/src /tmp/rpmbuild/zypper-1.2.12/build/src/CMakeFiles/zypp-refresh-wrapper.dir/DependInfo.cmake --color= Scanning dependencies of target zypp-refresh-wrapper make[2]: Leaving directory `/tmp/rpmbuild/zypper-1.2.12/build' make -f src/CMakeFiles/zypp-refresh-wrapper.dir/build.make src/CMakeFiles/zypp-refresh-wrapper.dir/build make[2]: Entering directory `/tmp/rpmbuild/zypper-1.2.12/build' /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 2 [ 3%] Building C object src/CMakeFiles/zypp-refresh-wrapper.dir/zypp-refresh-wrapper.c.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/gcc -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypp-refresh-wrapper.dir/zypp-refresh-wrapper.c.o -c /tmp/rpmbuild/zypper-1.2.12/src/zypp-refresh-wrapper.c Linking C executable zypp-refresh-wrapper cd /tmp/rpmbuild/zypper-1.2.12/build/src && /usr/bin/cmake -E cmake_link_script CMakeFiles/zypp-refresh-wrapper.dir/link.txt --verbose=1 /opt/icecream/bin/gcc -g -O2 -Wall -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -fPIC CMakeFiles/zypp-refresh-wrapper.dir/zypp-refresh-wrapper.c.o -o zypp-refresh-wrapper -rdynamic -lzypp make[2]: Leaving directory `/tmp/rpmbuild/zypper-1.2.12/build' /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 2 [ 3%] Built target zypp-refresh-wrapper make -f src/CMakeFiles/zypper.dir/build.make src/CMakeFiles/zypper.dir/depend make[2]: Entering directory `/tmp/rpmbuild/zypper-1.2.12/build' cd /tmp/rpmbuild/zypper-1.2.12/build && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/rpmbuild/zypper-1.2.12 /tmp/rpmbuild/zypper-1.2.12/src /tmp/rpmbuild/zypper-1.2.12/build /tmp/rpmbuild/zypper-1.2.12/build/src /tmp/rpmbuild/zypper-1.2.12/build/src/CMakeFiles/zypper.dir/DependInfo.cmake --color= Scanning dependencies of target zypper make[2]: Leaving directory `/tmp/rpmbuild/zypper-1.2.12/build' make -f src/CMakeFiles/zypper.dir/build.make src/CMakeFiles/zypper.dir/build make[2]: Entering directory `/tmp/rpmbuild/zypper-1.2.12/build' /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 3 [ 5%] Building CXX object src/CMakeFiles/zypper.dir/Zypper.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/Zypper.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/Zypper.cc In file included from /tmp/rpmbuild/zypper-1.2.12/src/Zypper.cc:26: /usr/include/zypp/zypp_detail/ZYppReadOnlyHack.h:15:2: warning: #warning ZYPP_ZYPP_DETAIL_ZYPPREADONLYHACK_H /tmp/rpmbuild/zypper-1.2.12/src/Zypper.cc: In member function 'void Zypper::doCommand()': /tmp/rpmbuild/zypper-1.2.12/src/Zypper.cc:2435: warning: 'void zypp::zypp_readonly_hack::IWantIt()' is deprecated (declared at /usr/include/zypp/zypp_detail/ZYppReadOnlyHack.h:26) /tmp/rpmbuild/zypper-1.2.12/src/Zypper.cc:2435: warning: 'void zypp::zypp_readonly_hack::IWantIt()' is deprecated (declared at /usr/include/zypp/zypp_detail/ZYppReadOnlyHack.h:26) /tmp/rpmbuild/zypper-1.2.12/src/Zypper.cc:2439: warning: 'void zypp::zypp_readonly_hack::IWantIt()' is deprecated (declared at /usr/include/zypp/zypp_detail/ZYppReadOnlyHack.h:26) /tmp/rpmbuild/zypper-1.2.12/src/Zypper.cc:2439: warning: 'void zypp::zypp_readonly_hack::IWantIt()' is deprecated (declared at /usr/include/zypp/zypp_detail/ZYppReadOnlyHack.h:26) /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 4 [ 7%] Building CXX object src/CMakeFiles/zypper.dir/main.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/main.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/main.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 5 [ 9%] Building CXX object src/CMakeFiles/zypper.dir/Command.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/Command.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/Command.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 6 [ 11%] Building CXX object src/CMakeFiles/zypper.dir/Config.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/Config.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/Config.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 7 [ 13%] Building CXX object src/CMakeFiles/zypper.dir/repos.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/repos.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/repos.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 8 [ 15%] Building CXX object src/CMakeFiles/zypper.dir/misc.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/misc.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/misc.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 9 [ 16%] Building CXX object src/CMakeFiles/zypper.dir/search.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/search.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/search.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 10 [ 18%] Building CXX object src/CMakeFiles/zypper.dir/info.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/info.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/info.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 11 [ 20%] Building CXX object src/CMakeFiles/zypper.dir/Table.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/Table.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/Table.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 12 [ 22%] Building CXX object src/CMakeFiles/zypper.dir/locks.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/locks.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/locks.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 13 [ 24%] Building CXX object src/CMakeFiles/zypper.dir/install.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/install.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/install.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 14 [ 26%] Building CXX object src/CMakeFiles/zypper.dir/update.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/update.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/update.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 15 [ 28%] Building CXX object src/CMakeFiles/zypper.dir/solve-commit.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/solve-commit.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/solve-commit.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 16 [ 30%] Building CXX object src/CMakeFiles/zypper.dir/Summary.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/Summary.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/Summary.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 17 [ 32%] Building CXX object src/CMakeFiles/zypper.dir/output/Out.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/output/Out.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/output/Out.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 18 [ 33%] Building CXX object src/CMakeFiles/zypper.dir/output/OutNormal.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/output/OutNormal.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/output/OutNormal.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 19 [ 35%] Building CXX object src/CMakeFiles/zypper.dir/output/OutXML.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/output/OutXML.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/output/OutXML.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 20 [ 37%] Building CXX object src/CMakeFiles/zypper.dir/utils/Augeas.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/utils/Augeas.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/utils/Augeas.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 21 [ 39%] Building CXX object src/CMakeFiles/zypper.dir/utils/colors.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/utils/colors.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/utils/colors.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 22 [ 41%] Building CXX object src/CMakeFiles/zypper.dir/utils/getopt.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/utils/getopt.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/utils/getopt.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 23 [ 43%] Building CXX object src/CMakeFiles/zypper.dir/utils/messages.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/utils/messages.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/utils/messages.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 24 [ 45%] Building CXX object src/CMakeFiles/zypper.dir/utils/misc.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/utils/misc.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/utils/misc.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 25 [ 47%] Building CXX object src/CMakeFiles/zypper.dir/utils/pager.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/utils/pager.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/utils/pager.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 26 [ 49%] Building CXX object src/CMakeFiles/zypper.dir/utils/prompt.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/utils/prompt.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/utils/prompt.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 27 [ 50%] Building CXX object src/CMakeFiles/zypper.dir/utils/richtext.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/utils/richtext.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/utils/richtext.cc /usr/bin/cmake -E cmake_progress_report /tmp/rpmbuild/zypper-1.2.12/build/CMakeFiles 28 [ 52%] Building CXX object src/CMakeFiles/zypper.dir/utils/text.cc.o cd /tmp/rpmbuild/zypper-1.2.12/build/src && /opt/icecream/bin/g++ -D_FILE_OFFSET_BITS=64 -DVERSION=\"1.2.12\" -DPACKAGE=\"zypper\" -DLOCALEDIR=\"/usr/share/locale\" -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -I/tmp/rpmbuild/zypper-1.2.12 -I/tmp/rpmbuild/zypper-1.2.12/build -I/tmp/rpmbuild/zypper-1.2.12/src -o CMakeFiles/zypper.dir/utils/text.cc.o -c /tmp/rpmbuild/zypper-1.2.12/src/utils/text.cc Linking CXX executable zypper cd /tmp/rpmbuild/zypper-1.2.12/build/src && /usr/bin/cmake -E cmake_link_script CMakeFiles/zypper.dir/link.txt --verbose=1 /opt/icecream/bin/g++ -g -O2 -Wall -Woverloaded-virtual -fstack-protector -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -fPIC CMakeFiles/zypper.dir/Zypper.cc.o CMakeFiles/zypper.dir/main.cc.o CMakeFiles/zypper.dir/Command.cc.o CMakeFiles/zypper.dir/Config.cc.o CMakeFiles/zypper.dir/repos.cc.o CMakeFiles/zypper.dir/misc.cc.o CMakeFiles/zypper.dir/search.cc.o CMakeFiles/zypper.dir/info.cc.o CMakeFiles/zypper.dir/Table.cc.o CMakeFiles/zypper.dir/locks.cc.o CMakeFiles/zypper.dir/install.cc.o CMakeFiles/zypper.dir/update.cc.o CMakeFiles/zypper.dir/solve-commit.cc.o CMakeFiles/zypper.dir/Summary.cc.o CMakeFiles/zypper.dir/output/Out.cc.o CMakeFiles/zypper.dir/output/OutNormal.cc.o CMakeFiles/zypper.dir/output/OutXML.cc.o CMakeFiles/zypper.dir/utils/Augeas.cc.o CMakeFiles/zypper.dir/utils/colors.cc.o CMakeFiles/zypper.dir/utils/getopt.cc.o CMakeFiles/zypper.dir/utils/messages.cc.o CMakeFiles/zypper.dir/utils/misc.cc.o CMakeFiles/zypper.dir/utils/pager.cc.o CMakeFiles/zypper.dir/utils/prompt.cc.o CMakeFiles/zypper.dir/utils/richtext.cc.o CMakeFiles/zypper.dir/utils/text.cc.o -o zypper -rdynamic -lzypp -lreadline -laugeas -laugeas CMakeFiles/zypper.dir/Zypper.cc.o: In function `Zypper::doCommand()': /tmp/rpmbuild/zypper-1.2.12/src/Zypper.cc:3612: undefined reference to `void init_repos<std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >(Zypper&, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&)' /tmp/rpmbuild/zypper-1.2.12/src/Zypper.cc:3839: undefined reference to `void init_repos<std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >(Zypper&, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&)' collect2: ld returned 1 exit status make[2]: *** [src/zypper] Error 1 make[2]: Leaving directory `/tmp/rpmbuild/zypper-1.2.12/build' make[1]: *** [src/CMakeFiles/zypper.dir/all] Error 2 make[1]: Leaving directory `/tmp/rpmbuild/zypper-1.2.12/build' make: *** [all] Error 2 error: Bad exit status from /var/tmp/rpm-tmp.WwrL4J (%build) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.WwrL4J (%build) ( ) ( ) ( ) _ ) ( \_ _(_\ \)__ (____\___)) build failed stopping dbus.. Shutting down D-Bus daemon..done ... unmounting sys ... unmounting proc ... unmounting pts umount: /data/hudson/HUDSON-CHROOT/zypp-head-x86_64/dev/pts: not mounted Can't unmount devpts /data/hudson/HUDSON-CHROOT/zypp-head-x86_64/dev/pts Archiving artifacts -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 7