July 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <libzypp> SuSE-Code-11-Branch : changes
by Michael Andres 31 Jul '09

31 Jul '09

ref: refs/heads/SuSE-Code-11-Branch commit be44cea0a82449ee3cab99f401f6bb86c1e21997 Author: Michael Andres <ma(a)suse.de> Date: Fri Jul 31 18:15:35 2009 +0200 changes --- package/libzypp.changes | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/package/libzypp.changes b/package/libzypp.changes index 50e82fd..e13134c 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,6 +1,7 @@ ------------------------------------------------------------------- -Fri Jul 31 16:08:43 CEST 2009 - ma(a)suse.de +Fri Jul 31 18:14:04 CEST 2009 - ma(a)suse.de +- Removing a package lock was not counted as state change (bnc #501850) - Remove confusing newlines in vendor change info (bnc #503859) - version 5.30.9 (23) -- 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> SuSE-Code-11-Branch : Removing a package lock was not counted as state change (bnc #501850)
by Michael Andres 31 Jul '09

31 Jul '09

ref: refs/heads/SuSE-Code-11-Branch commit bf5e23442aa71ede75e618b4d56572bc87b41eac Author: Michael Andres <ma(a)suse.de> Date: Fri Jul 31 18:08:15 2009 +0200 Removing a package lock was not counted as state change (bnc #501850) --- tests/zypp/ResStatus_test.cc | 32 ++++++++++++++++++++++++++++++++ zypp/PoolItem.cc | 9 +++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/tests/zypp/ResStatus_test.cc b/tests/zypp/ResStatus_test.cc index c18e92f..5b975e0 100644 --- a/tests/zypp/ResStatus_test.cc +++ b/tests/zypp/ResStatus_test.cc @@ -209,3 +209,35 @@ BOOST_AUTO_TEST_CASE(transition) testTable( &ResStatus::setSoftTransact, &evaluateSetSoftTransact ); testTable( &ResStatus::setLock, &evaluateSetLock ); } + + +bool WhilePoolItemSameStateIsPrivate( ResStatus ostatus, ResStatus nstatus ) +{ + if ( nstatus == ostatus ) + return true; + // some bits changed... + if ( nstatus.getTransactValue() != ostatus.getTransactValue() + && ( ! nstatus.isBySolver() // ignore solver state changes + // removing a user lock also goes to bySolver + || ostatus.getTransactValue() == ResStatus::LOCKED ) ) + return false; + if ( nstatus.isLicenceConfirmed() != ostatus.isLicenceConfirmed() ) + return false; + return true; +} + +BOOST_AUTO_TEST_CASE(savestate) +{ + ResStatus ostatus; + ResStatus nstatus; + + BOOST_CHECK_EQUAL( WhilePoolItemSameStateIsPrivate( ostatus, nstatus ), true ); + nstatus.setLock( true, ResStatus::USER ); + BOOST_CHECK_EQUAL( WhilePoolItemSameStateIsPrivate( ostatus, nstatus ), false ); + ostatus = nstatus; + nstatus.setLock( false, ResStatus::USER ); + BOOST_CHECK_EQUAL( WhilePoolItemSameStateIsPrivate( ostatus, nstatus ), false ); +} + + + diff --git a/zypp/PoolItem.cc b/zypp/PoolItem.cc index 28ac594..710255a 100644 --- a/zypp/PoolItem.cc +++ b/zypp/PoolItem.cc @@ -106,8 +106,13 @@ namespace zypp { status() = _savedStatus; } bool sameState() const { - if ( status().getTransactValue() != _savedStatus.getTransactValue() - && !status().isBySolver() ) + if ( status() == _savedStatus ) + return true; + // some bits changed... + if ( status().getTransactValue() != _savedStatus.getTransactValue() + && ( ! status().isBySolver() // ignore solver state changes + // removing a user lock also goes to bySolver + || _savedStatus.getTransactValue() == ResStatus::LOCKED ) ) return false; if ( status().isLicenceConfirmed() != _savedStatus.isLicenceConfirmed() ) return false; -- 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.12.0
by Michael Andres 31 Jul '09

31 Jul '09

ref: refs/heads/master commit 20c68d8186a3890287dac2736098c0b49b8642db Author: Michael Andres <ma(a)suse.de> Date: Fri Jul 31 18:12:20 2009 +0200 changes 6.12.0 --- VERSION.cmake | 6 +++--- package/libzypp.changes | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 94ddab8..04bf8a1 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "6") SET(LIBZYPP_COMPATMINOR "11") -SET(LIBZYPP_MINOR "11") -SET(LIBZYPP_PATCH "4") +SET(LIBZYPP_MINOR "12") +SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 6.11.4 (11) +# LAST RELEASED: 6.12.0 (11) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index d963c0a..f2bd12f 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Jul 31 17:55:33 CEST 2009 - ma(a)suse.de + +- Remove confusing newlines in vendor change info (bnc #503859) +- Removing a package lock was not counted as state change (bnc #501850) +- Take solver_allowVendorChange option into account when computing the + Selectables default candidate. +- version 6.12.0 (11) + +------------------------------------------------------------------- Wed Jul 29 13:36:19 CEST 2009 - ma(a)suse.de - Avoid deadlock after fork and failed exec. (bnc 493152) -- 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> ma-misc : changes 6.12.0
by Michael Andres 31 Jul '09

31 Jul '09

ref: refs/heads/ma-misc commit 20c68d8186a3890287dac2736098c0b49b8642db Author: Michael Andres <ma(a)suse.de> Date: Fri Jul 31 18:12:20 2009 +0200 changes 6.12.0 --- VERSION.cmake | 6 +++--- package/libzypp.changes | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 94ddab8..04bf8a1 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "6") SET(LIBZYPP_COMPATMINOR "11") -SET(LIBZYPP_MINOR "11") -SET(LIBZYPP_PATCH "4") +SET(LIBZYPP_MINOR "12") +SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 6.11.4 (11) +# LAST RELEASED: 6.12.0 (11) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index d963c0a..f2bd12f 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Jul 31 17:55:33 CEST 2009 - ma(a)suse.de + +- Remove confusing newlines in vendor change info (bnc #503859) +- Removing a package lock was not counted as state change (bnc #501850) +- Take solver_allowVendorChange option into account when computing the + Selectables default candidate. +- version 6.12.0 (11) + +------------------------------------------------------------------- Wed Jul 29 13:36:19 CEST 2009 - ma(a)suse.de - Avoid deadlock after fork and failed exec. (bnc 493152) -- 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 : Take solver_allowVendorChange option into account when computing the Selectables default candidate.
by Michael Andres 31 Jul '09

31 Jul '09

ref: refs/heads/master commit db04ce4846e34b67b30069757bbe7b5fe1f7c1b0 Author: Michael Andres <ma(a)suse.de> Date: Fri Jul 31 18:12:00 2009 +0200 Take solver_allowVendorChange option into account when computing the Selectables default candidate. --- zypp/Vendor.h | 1 + zypp/VendorAttr.cc | 6 ++++++ zypp/VendorAttr.h | 2 ++ zypp/ui/SelectableImpl.h | 25 +++++++++++++++++++------ 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/zypp/Vendor.h b/zypp/Vendor.h index 73368be..8de5063 100644 --- a/zypp/Vendor.h +++ b/zypp/Vendor.h @@ -13,6 +13,7 @@ #define ZYPP_VENDOR_H #include <string> +#include "zypp/IdString.h" /////////////////////////////////////////////////////////////////// namespace zypp diff --git a/zypp/VendorAttr.cc b/zypp/VendorAttr.cc index 6e00e85..5481a96 100644 --- a/zypp/VendorAttr.cc +++ b/zypp/VendorAttr.cc @@ -226,6 +226,12 @@ namespace zypp return true; } + bool VendorAttr::equivalent( IdString lVendor, IdString rVendor ) const + { + if ( lVendor == rVendor ) + return true; + return equivalent( lVendor.asString(), rVendor.asString() ); + } bool VendorAttr::equivalent( const Vendor & lVendor, const Vendor & rVendor ) const { diff --git a/zypp/VendorAttr.h b/zypp/VendorAttr.h index 55f0408..7ddda98 100644 --- a/zypp/VendorAttr.h +++ b/zypp/VendorAttr.h @@ -63,6 +63,8 @@ class VendorAttr * different vendor usually must be confirmed by the user. */ bool equivalent( const Vendor & lVendor, const Vendor & rVendor ) const; + /** \overload using IdStrings */ + bool equivalent( IdString lVendor, IdString rVendor ) const; private: VendorAttr(); diff --git a/zypp/ui/SelectableImpl.h b/zypp/ui/SelectableImpl.h index 3c70d67..008333b 100644 --- a/zypp/ui/SelectableImpl.h +++ b/zypp/ui/SelectableImpl.h @@ -17,6 +17,7 @@ #include "zypp/base/PtrTypes.h" +#include "zypp/ZConfig.h" #include "zypp/ui/Selectable.h" #include "zypp/ui/SelectableTraits.h" @@ -68,6 +69,7 @@ namespace zypp else _availableItems.insert( *it ); } + _defaultCandidate = defaultCandidate(); } public: @@ -106,10 +108,7 @@ namespace zypp PoolItem ret( transactingCandidate() ); if ( ret ) return ret; - - if ( _candidate ) - return _candidate; - return defaultCandidate(); + return _candidate ? _candidate : _defaultCandidate; } /** Set a userCandidate (out of available objects). @@ -213,18 +212,30 @@ namespace zypp { if ( !installedEmpty() ) { - // prefer the installed objects arch. + // prefer the installed objects arch and vendor + bool solver_allowVendorChange( ZConfig::instance().solver_allowVendorChange() ); for ( installed_const_iterator iit = installedBegin(); iit != installedEnd(); ++iit ) { + PoolItem sameArch; // in case there's no same vendor at least stay with same arch for ( available_const_iterator it = availableBegin(); it != availableEnd(); ++it ) { if ( (*iit)->arch() == (*it)->arch() ) { - return (*it); + if ( ! solver_allowVendorChange ) + { + if ( VendorAttr::instance().equivalent( (*iit).satSolvable().vendor(), (*it).satSolvable().vendor() ) ) + return *it; + else if ( ! sameArch ) // remember best same arch in case no same vendor found + sameArch = *it; + } + else // same arch is sufficient + return *it; } } + if ( sameArch ) + return sameArch; } } if ( _availableItems.empty() ) @@ -250,6 +261,8 @@ namespace zypp const std::string _name; InstalledItemSet _installedItems; AvailableItemSet _availableItems; + //! Best among availabe with restpect to installed. + PoolItem _defaultCandidate; //! The object selected by setCandidateObj() method. PoolItem _candidate; }; -- 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> ma-misc : Take solver_allowVendorChange option into account when computing the Selectables default candidate.
by Michael Andres 31 Jul '09

31 Jul '09

ref: refs/heads/ma-misc commit db04ce4846e34b67b30069757bbe7b5fe1f7c1b0 Author: Michael Andres <ma(a)suse.de> Date: Fri Jul 31 18:12:00 2009 +0200 Take solver_allowVendorChange option into account when computing the Selectables default candidate. --- zypp/Vendor.h | 1 + zypp/VendorAttr.cc | 6 ++++++ zypp/VendorAttr.h | 2 ++ zypp/ui/SelectableImpl.h | 25 +++++++++++++++++++------ 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/zypp/Vendor.h b/zypp/Vendor.h index 73368be..8de5063 100644 --- a/zypp/Vendor.h +++ b/zypp/Vendor.h @@ -13,6 +13,7 @@ #define ZYPP_VENDOR_H #include <string> +#include "zypp/IdString.h" /////////////////////////////////////////////////////////////////// namespace zypp diff --git a/zypp/VendorAttr.cc b/zypp/VendorAttr.cc index 6e00e85..5481a96 100644 --- a/zypp/VendorAttr.cc +++ b/zypp/VendorAttr.cc @@ -226,6 +226,12 @@ namespace zypp return true; } + bool VendorAttr::equivalent( IdString lVendor, IdString rVendor ) const + { + if ( lVendor == rVendor ) + return true; + return equivalent( lVendor.asString(), rVendor.asString() ); + } bool VendorAttr::equivalent( const Vendor & lVendor, const Vendor & rVendor ) const { diff --git a/zypp/VendorAttr.h b/zypp/VendorAttr.h index 55f0408..7ddda98 100644 --- a/zypp/VendorAttr.h +++ b/zypp/VendorAttr.h @@ -63,6 +63,8 @@ class VendorAttr * different vendor usually must be confirmed by the user. */ bool equivalent( const Vendor & lVendor, const Vendor & rVendor ) const; + /** \overload using IdStrings */ + bool equivalent( IdString lVendor, IdString rVendor ) const; private: VendorAttr(); diff --git a/zypp/ui/SelectableImpl.h b/zypp/ui/SelectableImpl.h index 3c70d67..008333b 100644 --- a/zypp/ui/SelectableImpl.h +++ b/zypp/ui/SelectableImpl.h @@ -17,6 +17,7 @@ #include "zypp/base/PtrTypes.h" +#include "zypp/ZConfig.h" #include "zypp/ui/Selectable.h" #include "zypp/ui/SelectableTraits.h" @@ -68,6 +69,7 @@ namespace zypp else _availableItems.insert( *it ); } + _defaultCandidate = defaultCandidate(); } public: @@ -106,10 +108,7 @@ namespace zypp PoolItem ret( transactingCandidate() ); if ( ret ) return ret; - - if ( _candidate ) - return _candidate; - return defaultCandidate(); + return _candidate ? _candidate : _defaultCandidate; } /** Set a userCandidate (out of available objects). @@ -213,18 +212,30 @@ namespace zypp { if ( !installedEmpty() ) { - // prefer the installed objects arch. + // prefer the installed objects arch and vendor + bool solver_allowVendorChange( ZConfig::instance().solver_allowVendorChange() ); for ( installed_const_iterator iit = installedBegin(); iit != installedEnd(); ++iit ) { + PoolItem sameArch; // in case there's no same vendor at least stay with same arch for ( available_const_iterator it = availableBegin(); it != availableEnd(); ++it ) { if ( (*iit)->arch() == (*it)->arch() ) { - return (*it); + if ( ! solver_allowVendorChange ) + { + if ( VendorAttr::instance().equivalent( (*iit).satSolvable().vendor(), (*it).satSolvable().vendor() ) ) + return *it; + else if ( ! sameArch ) // remember best same arch in case no same vendor found + sameArch = *it; + } + else // same arch is sufficient + return *it; } } + if ( sameArch ) + return sameArch; } } if ( _availableItems.empty() ) @@ -250,6 +261,8 @@ namespace zypp const std::string _name; InstalledItemSet _installedItems; AvailableItemSet _availableItems; + //! Best among availabe with restpect to installed. + PoolItem _defaultCandidate; //! The object selected by setCandidateObj() method. PoolItem _candidate; }; -- 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 : Removing a package lock was not counted as state change (bnc #501850)
by Michael Andres 31 Jul '09

31 Jul '09

ref: refs/heads/master commit 973b9d9606c030681c5bb9664c8c823cf661d530 Author: Michael Andres <ma(a)suse.de> Date: Fri Jul 31 18:08:15 2009 +0200 Removing a package lock was not counted as state change (bnc #501850) --- tests/zypp/ResStatus_test.cc | 32 ++++++++++++++++++++++++++++++++ zypp/PoolItem.cc | 9 +++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/tests/zypp/ResStatus_test.cc b/tests/zypp/ResStatus_test.cc index c18e92f..5b975e0 100644 --- a/tests/zypp/ResStatus_test.cc +++ b/tests/zypp/ResStatus_test.cc @@ -209,3 +209,35 @@ BOOST_AUTO_TEST_CASE(transition) testTable( &ResStatus::setSoftTransact, &evaluateSetSoftTransact ); testTable( &ResStatus::setLock, &evaluateSetLock ); } + + +bool WhilePoolItemSameStateIsPrivate( ResStatus ostatus, ResStatus nstatus ) +{ + if ( nstatus == ostatus ) + return true; + // some bits changed... + if ( nstatus.getTransactValue() != ostatus.getTransactValue() + && ( ! nstatus.isBySolver() // ignore solver state changes + // removing a user lock also goes to bySolver + || ostatus.getTransactValue() == ResStatus::LOCKED ) ) + return false; + if ( nstatus.isLicenceConfirmed() != ostatus.isLicenceConfirmed() ) + return false; + return true; +} + +BOOST_AUTO_TEST_CASE(savestate) +{ + ResStatus ostatus; + ResStatus nstatus; + + BOOST_CHECK_EQUAL( WhilePoolItemSameStateIsPrivate( ostatus, nstatus ), true ); + nstatus.setLock( true, ResStatus::USER ); + BOOST_CHECK_EQUAL( WhilePoolItemSameStateIsPrivate( ostatus, nstatus ), false ); + ostatus = nstatus; + nstatus.setLock( false, ResStatus::USER ); + BOOST_CHECK_EQUAL( WhilePoolItemSameStateIsPrivate( ostatus, nstatus ), false ); +} + + + diff --git a/zypp/PoolItem.cc b/zypp/PoolItem.cc index 28ac594..710255a 100644 --- a/zypp/PoolItem.cc +++ b/zypp/PoolItem.cc @@ -106,8 +106,13 @@ namespace zypp { status() = _savedStatus; } bool sameState() const { - if ( status().getTransactValue() != _savedStatus.getTransactValue() - && !status().isBySolver() ) + if ( status() == _savedStatus ) + return true; + // some bits changed... + if ( status().getTransactValue() != _savedStatus.getTransactValue() + && ( ! status().isBySolver() // ignore solver state changes + // removing a user lock also goes to bySolver + || _savedStatus.getTransactValue() == ResStatus::LOCKED ) ) return false; if ( status().isLicenceConfirmed() != _savedStatus.isLicenceConfirmed() ) return false; -- 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> ma-misc : Removing a package lock was not counted as state change (bnc #501850)
by Michael Andres 31 Jul '09

31 Jul '09

ref: refs/heads/ma-misc commit 973b9d9606c030681c5bb9664c8c823cf661d530 Author: Michael Andres <ma(a)suse.de> Date: Fri Jul 31 18:08:15 2009 +0200 Removing a package lock was not counted as state change (bnc #501850) --- tests/zypp/ResStatus_test.cc | 32 ++++++++++++++++++++++++++++++++ zypp/PoolItem.cc | 9 +++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/tests/zypp/ResStatus_test.cc b/tests/zypp/ResStatus_test.cc index c18e92f..5b975e0 100644 --- a/tests/zypp/ResStatus_test.cc +++ b/tests/zypp/ResStatus_test.cc @@ -209,3 +209,35 @@ BOOST_AUTO_TEST_CASE(transition) testTable( &ResStatus::setSoftTransact, &evaluateSetSoftTransact ); testTable( &ResStatus::setLock, &evaluateSetLock ); } + + +bool WhilePoolItemSameStateIsPrivate( ResStatus ostatus, ResStatus nstatus ) +{ + if ( nstatus == ostatus ) + return true; + // some bits changed... + if ( nstatus.getTransactValue() != ostatus.getTransactValue() + && ( ! nstatus.isBySolver() // ignore solver state changes + // removing a user lock also goes to bySolver + || ostatus.getTransactValue() == ResStatus::LOCKED ) ) + return false; + if ( nstatus.isLicenceConfirmed() != ostatus.isLicenceConfirmed() ) + return false; + return true; +} + +BOOST_AUTO_TEST_CASE(savestate) +{ + ResStatus ostatus; + ResStatus nstatus; + + BOOST_CHECK_EQUAL( WhilePoolItemSameStateIsPrivate( ostatus, nstatus ), true ); + nstatus.setLock( true, ResStatus::USER ); + BOOST_CHECK_EQUAL( WhilePoolItemSameStateIsPrivate( ostatus, nstatus ), false ); + ostatus = nstatus; + nstatus.setLock( false, ResStatus::USER ); + BOOST_CHECK_EQUAL( WhilePoolItemSameStateIsPrivate( ostatus, nstatus ), false ); +} + + + diff --git a/zypp/PoolItem.cc b/zypp/PoolItem.cc index 28ac594..710255a 100644 --- a/zypp/PoolItem.cc +++ b/zypp/PoolItem.cc @@ -106,8 +106,13 @@ namespace zypp { status() = _savedStatus; } bool sameState() const { - if ( status().getTransactValue() != _savedStatus.getTransactValue() - && !status().isBySolver() ) + if ( status() == _savedStatus ) + return true; + // some bits changed... + if ( status().getTransactValue() != _savedStatus.getTransactValue() + && ( ! status().isBySolver() // ignore solver state changes + // removing a user lock also goes to bySolver + || _savedStatus.getTransactValue() == ResStatus::LOCKED ) ) return false; if ( status().isLicenceConfirmed() != _savedStatus.isLicenceConfirmed() ) return false; -- 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 : write to stdout
by Michael Andres 31 Jul '09

31 Jul '09

ref: refs/heads/master commit 9af328e349b275096ed9440aa894778af934f1bd Author: Michael Andres <ma(a)suse.de> Date: Fri Jul 31 16:32:09 2009 +0200 write to stdout --- tools/NameReqPrv.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/NameReqPrv.cc b/tools/NameReqPrv.cc index 108cfcd..953e62b 100644 --- a/tools/NameReqPrv.cc +++ b/tools/NameReqPrv.cc @@ -6,7 +6,7 @@ static std::string appname( "NameReqPrv" ); -#define message cerr +#define message cout using std::flush; int errexit( const std::string & msg_r = std::string(), int exit_r = 100 ) -- 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> ma-misc : write to stdout
by Michael Andres 31 Jul '09

31 Jul '09

ref: refs/heads/ma-misc commit 9af328e349b275096ed9440aa894778af934f1bd Author: Michael Andres <ma(a)suse.de> Date: Fri Jul 31 16:32:09 2009 +0200 write to stdout --- tools/NameReqPrv.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/NameReqPrv.cc b/tools/NameReqPrv.cc index 108cfcd..953e62b 100644 --- a/tools/NameReqPrv.cc +++ b/tools/NameReqPrv.cc @@ -6,7 +6,7 @@ static std::string appname( "NameReqPrv" ); -#define message cerr +#define message cout using std::flush; int errexit( const std::string & msg_r = std::string(), int exit_r = 100 ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0