February 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <libzypp> master : start refactoring command line calling into a separate entity so we
by Duncan Mac-Vicar P 17 Feb '09

17 Feb '09

ref: refs/heads/master commit c31829af1abb6c17b8b493ef5cc340e8ab28c577 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Feb 17 19:05:26 2009 +0100 start refactoring command line calling into a separate entity so we could mix curl and aria usage --- zypp/CMakeLists.txt | 2 + zypp/media/TransferProgram.cc | 206 +++++++++++++++++++++++++++++++++++++++++ zypp/media/TransferProgram.h | 135 +++++++++++++++++++++++++++ 3 files changed, 343 insertions(+), 0 deletions(-) diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt index d6c5239..6eb2f37 100644 --- a/zypp/CMakeLists.txt +++ b/zypp/CMakeLists.txt @@ -270,6 +270,7 @@ SET( zypp_media_SRCS media/CredentialFileReader.cc media/CredentialManager.cc media/CurlConfig.cc + media/TransferProgram.cc ) SET( zypp_media_HEADERS @@ -293,6 +294,7 @@ SET( zypp_media_HEADERS media/CredentialFileReader.h media/CredentialManager.h media/CurlConfig.h + media/TransferProgram.h ) INSTALL( FILES diff --git a/zypp/media/TransferProgram.cc b/zypp/media/TransferProgram.cc new file mode 100644 index 0000000..2542fed --- /dev/null +++ b/zypp/media/TransferProgram.cc @@ -0,0 +1,206 @@ +#include <iostream> +#include <vector> +#include <sstream> + +#include "zypp/base/String.h" +#include "zypp/base/Logger.h" +#include "zypp/base/WatchFile.h" +#include "zypp/base/ReferenceCounted.h" +#include "zypp/base/NonCopyable.h" +#include "zypp/ExternalProgram.h" +#include "zypp/media/TransferProgram.h" + +using namespace std; + +#define ARIA2C_BINARY "/usr/bin/aria2c" +#define CURL_BINARY "/usr/bin/curl" + +namespace zypp +{ +namespace media +{ + +class TransferProgram::Impl +{ +public: + Impl() + : _useproxy(false) + , _timeout(0) + {} + + virtual ~Impl() + {} + + virtual void execute() + { + ERR << "not implemented." << endl; + ZYPP_THROW(Exception("not implemented")); + } + + /** Offer default Impl. */ + static shared_ptr<Impl> nullimpl() + { + static shared_ptr<Impl> _nullimpl( new Impl ); + return _nullimpl; + } + +private: + friend Impl * rwcowClone<Impl>( const Impl * rhs ); + /** clone for RWCOW_pointer */ + Impl * clone() const + { return new Impl( *this ); } + +public: + vector<string> _headers; + string _useragent; + string _username; + string _password; + bool _useproxy; + string _proxy_username; + string _proxy_password; + int _timeout; + Url _url; + + TransferProgram::OutputLines _output; + ErrorFlags _errorFlags; + int _exitCode; +}; + +class Aria2cProgram : public TransferProgram::Impl +{ +public: + virtual void execute() + { + ExternalProgram::Arguments args; + + args.push_back(ARIA2C_BINARY); + args.push_back(str::form("--user-agent=%s", _useragent.c_str())); + args.push_back("--summary-interval=1"); + args.push_back("--follow-metalink=mem"); + args.push_back("--check-integrity=true"); + + // add the anonymous id. + for ( vector<string>::const_iterator it = _headers.begin(); + it != _headers.end(); + ++it ) + args.push_back(str::form("--header=%s", it->c_str() )); + + args.push_back( str::form("--connect-timeout=%d", _timeout)); + + ExternalProgram prog(args,ExternalProgram::Discard_Stderr, false, -1, true); + string line; + int count; + for(line = prog.receiveLine(), count=0; + !line.empty(); + line = prog.receiveLine(), count++ ) + { + // save the line + _output.push_back(line); + + // trim trailing NL. + if ( line.empty() ) + continue; + // make sure no \n is at the end + line = str::rtrim(line); + + // process lines + } + _exitCode = prog.close(); + + // clear previous argument + args.clear(); + } +}; + +class CurlProgram : public TransferProgram::Impl +{ +public: + virtual void execute() + { + } +}; + + +TransferProgram::TransferProgram() + : _impl() +{ + +} + +TransferProgram::OutputLines::const_iterator TransferProgram::outputLinesBegin() const +{ + return _impl->_output.begin(); +} + +TransferProgram::OutputLines::const_iterator TransferProgram::outputLinesEnd() const +{ + return _impl->_output.end(); +} + +string TransferProgram::output() const +{ + stringstream str; + OutputLines::const_iterator it; + for ( it = outputLinesBegin(); + it != outputLinesEnd(); + ++it ) + { + str << *it; + } + return str.str(); +} + +void TransferProgram::execute() +{ + _impl->execute(); +} + +void TransferProgram::addHeader( const std::string &header ) +{ + _impl->_headers.push_back(header); +} + +void TransferProgram::setUserAgentString( const std::string &agent ) +{ + _impl->_useragent = agent; +} + +void TransferProgram::setUsername( const std::string &username ) +{ + _impl->_username = username; +} + +void TransferProgram::setPassword( const std::string &password ) +{ + _impl->_password = password; +} + +void TransferProgram::setProxyEnabled( bool enabled ) +{ + _impl->_useproxy = enabled; +} + +void TransferProgram::setProxyUsername( const std::string &proxyuser ) +{ + _impl->_proxy_username = proxyuser; +} + +void TransferProgram::setProxyPassword( const std::string &proxypass ) +{ + _impl->_proxy_password = proxypass; +} + +void TransferProgram::setTimeout( int t ) +{ + _impl->_timeout = t; +} + +void TransferProgram::setUrl( const zypp::Url &url) +{ + _impl->_url = url; +} + + +} // ns media +} // ns zypp + diff --git a/zypp/media/TransferProgram.h b/zypp/media/TransferProgram.h new file mode 100644 index 0000000..4441c62 --- /dev/null +++ b/zypp/media/TransferProgram.h @@ -0,0 +1,135 @@ + +#ifndef TRANSFER_PROGRAM_H_ +#define TRANSFER_PROGRAM_H_ + +#include <functional> +#include <list> +#include <string> +#include <vector> +#include "zypp/base/Flags.h" +#include "zypp/base/PtrTypes.h" +#include "zypp/Pathname.h" +#include "zypp/Url.h" + +namespace zypp +{ +namespace media +{ + +/** + * Easy access to the transfer command line program + * + */ +class TransferProgram +{ +public: + + typedef std::vector<std::string> OutputLines; + + /** + * After calling the program, one or more error flags can + * be set according to the result. + */ + enum ErrorFlag + { + /** Operation ended successfully */ + NO_ERROR = 0x0, + }; + ZYPP_DECLARE_FLAGS(ErrorFlags,ErrorFlag); + + /** + * Constructs a gpg cmd line access. + * \p home is the home directory where keyrings are created. + * + * Gpg has one pubkeyring and one secret keyring in its home. + * + */ + TransferProgram(); + + /** + * Executes command with a given argument + */ + void execute(); + + /** + * Contains the error flags from the last command execution + */ + ErrorFlags errorFlags() const; + + /** + * contains the last command execution exit code + */ + int exitCode() const; + + /** + * begin iterator over output lines available after + * execute + */ + OutputLines::const_iterator outputLinesBegin() const; + + /** + * end iterator over output lines available after + * execute + */ + OutputLines::const_iterator outputLinesEnd() const; + + /** + * returns the full output for convenience + */ + std::string output() const; + + /** + * add a header, on the form "Foo: Bar" + */ + void addHeader( const std::string &header ); + + /** + * sets the user agent ie: "Mozilla v3" + */ + void setUserAgentString( const std::string &agent ); + + /** + * sets the auth username + */ + void setUsername( const std::string &username ); + + /** + * sets the auth password + */ + void setPassword( const std::string &password ); + + /** + * whether the proxy is used or not + */ + void setProxyEnabled( bool enabled ); + + /** + * sets the proxy user + */ + void setProxyUsername( const std::string &proxyuser ); + + /** + * sets the proxy password + */ + void setProxyPassword( const std::string &proxypass ); + + /** + * set the connection timeout + */ + void setTimeout( int t ); + + /** + * set url to download + */ + void setUrl( const zypp::Url &url); + + class Impl; +protected: + RWCOW_pointer<Impl> _impl; +}; +ZYPP_DECLARE_OPERATORS_FOR_FLAGS(TransferProgram::ErrorFlags); + +} // ns media +} // ns zypp + +#endif -- 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 : changes
by Michael Andres 17 Feb '09

17 Feb '09

ref: refs/heads/SuSE-Code-11-Branch commit 115b4acb317d58c5c8494a4689cb470649a5fab3 Author: Michael Andres <ma(a)suse.de> Date: Tue Feb 17 18:04:13 2009 +0100 changes --- VERSION.cmake | 6 +++--- package/libzypp.changes | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index c89eec3..860a3bc 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -50,9 +50,9 @@ # SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") -SET(LIBZYPP_MINOR "27") -SET(LIBZYPP_PATCH "6") +SET(LIBZYPP_MINOR "28") +SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 5.27.5 (23) +# LAST RELEASED: 5.28.0 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index 26ec838..e428dac 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 17 17:56:17 CET 2009 - ma(a)suse.de + +- Compute obsoletes based on names only (not considering provides) (bnc #471023) +- version 5.28.0 (23) + +------------------------------------------------------------------- Tue Feb 17 13:13:26 CET 2009 - jkupec(a)suse.cz - Fixed FTP authentication (bnc #472879) -- 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 : Compute obsoletes based on names only (not considering provides) (bnc #471023)
by Michael Andres 17 Feb '09

17 Feb '09

ref: refs/heads/SuSE-Code-11-Branch commit 570c5d3102a31aeb88b28967e56707d0ade29bc3 Author: Michael Andres <ma(a)suse.de> Date: Tue Feb 17 18:04:03 2009 +0100 Compute obsoletes based on names only (not considering provides) (bnc #471023) --- tests/data/TCWhatObsoletes/solver-system.xml | 55 +++++++++++ tests/data/TCWhatObsoletes/solver-test.xml | 7 ++ tests/sat/CMakeLists.txt | 2 +- tests/sat/WhatObsoletes_test.cc | 37 ++++++++ zypp/sat/WhatObsoletes.cc | 127 ++++++++++++++++++------- zypp/sat/WhatObsoletes.h | 21 ++++- 6 files changed, 208 insertions(+), 41 deletions(-) diff --git a/tests/data/TCWhatObsoletes/solver-system.xml b/tests/data/TCWhatObsoletes/solver-system.xml new file mode 100644 index 0000000..ce95a06 --- /dev/null +++ b/tests/data/TCWhatObsoletes/solver-system.xml @@ -0,0 +1,55 @@ +<channel><subchannel> +<package> + <name>test1</name> + <history><update> + <arch>i586</arch> + <version>1</version><release>1</release> + </update></history> + <provides> + <dep name='test1' op='==' version='1' release='1' /> + </provides> + <obsoletes> + <dep name='goaway' op='<' version='2' release='1' /> + </obsoletes> +</package> +<package> + <name>goaway</name> + <history><update> + <arch>i586</arch> + <version>1</version><release>1</release> + </update></history> + <provides> + <dep name='goaway' op='==' version='1' release='1' /> + </provides> +</package> +<package> + <name>goaway</name> + <history><update> + <arch>i586</arch> + <version>2</version><release>1</release> + </update></history> + <provides> + <dep name='goaway' op='==' version='2' release='1' /> + </provides> +</package> +<package> + <name>meetoo</name> + <history><update> + <arch>i586</arch> + <version>1</version><release>1</release> + </update></history> + <provides> + <dep name='goaway' op='==' version='1' release='1' /> + </provides> +</package> +<package> + <name>meetoo</name> + <history><update> + <arch>i586</arch> + <version>2</version><release>1</release> + </update></history> + <provides> + <dep name='goaway' op='==' version='2' release='1' /> + </provides> +</package> +</subchannel></channel> diff --git a/tests/data/TCWhatObsoletes/solver-test.xml b/tests/data/TCWhatObsoletes/solver-test.xml new file mode 100644 index 0000000..9a2143d --- /dev/null +++ b/tests/data/TCWhatObsoletes/solver-test.xml @@ -0,0 +1,7 @@ +<?xml version="1.0"?> +<test> +<setup arch="i686"> + <system file="solver-system.xml.gz"/> + <locale name="en_US" /> +</setup> +</test> diff --git a/tests/sat/CMakeLists.txt b/tests/sat/CMakeLists.txt index 309ebb9..60775d4 100644 --- a/tests/sat/CMakeLists.txt +++ b/tests/sat/CMakeLists.txt @@ -2,6 +2,6 @@ # to find the KeyRingTest receiver INCLUDE_DIRECTORIES( ${LIBZYPP_SOURCE_DIR}/tests/zypp ) -ADD_TESTS(Solvable SolvParsing WhatProvides LookupAttr) +ADD_TESTS(Solvable SolvParsing WhatProvides WhatObsoletes LookupAttr) diff --git a/tests/sat/WhatObsoletes_test.cc b/tests/sat/WhatObsoletes_test.cc new file mode 100644 index 0000000..c082d99 --- /dev/null +++ b/tests/sat/WhatObsoletes_test.cc @@ -0,0 +1,37 @@ +#include "TestSetup.h" +#include <zypp/sat/WhatObsoletes.h> + +#define LABELED(V) #V << ":\t" << V + +namespace zypp +{ + namespace sat + { + // Obsoletes may either match against provides, or names. + // Configuration depends on the behaviour of rpm. + extern bool obsoleteUsesProvides; + } +} + +BOOST_AUTO_TEST_CASE(WhatObsoletes) +{ + TestSetup test( Arch_x86_64 ); + test.loadTestcaseRepos( TESTS_SRC_DIR"/data/TCWhatObsoletes" ); + + sat::Solvable test1( 2 ); + BOOST_REQUIRE_EQUAL( test1.name(), "test1" ); + + { + sat::obsoleteUsesProvides = true; + sat::WhatObsoletes w( test1 ); + BOOST_REQUIRE( w.size() == 2 ); + // (3)goaway-1-1.i586(@System) + // (5)meetoo-1-1.i586(@System) + } + { + sat::obsoleteUsesProvides = false; + sat::WhatObsoletes w( test1 ); + BOOST_REQUIRE( w.size() == 1 ); + // (3)goaway-1-1.i586(@System) + } +} \ No newline at end of file diff --git a/zypp/sat/WhatObsoletes.cc b/zypp/sat/WhatObsoletes.cc index 077e73d..800b7e0 100644 --- a/zypp/sat/WhatObsoletes.cc +++ b/zypp/sat/WhatObsoletes.cc @@ -12,6 +12,7 @@ #include <iostream> #include "zypp/base/LogTools.h" +#include "zypp/base/Tr1hash.h" #include "zypp/sat/WhatObsoletes.h" #include "zypp/sat/detail/PoolImpl.h" #include "zypp/PoolItem.h" @@ -25,62 +26,116 @@ namespace zypp namespace sat { ///////////////////////////////////////////////////////////////// + // Obsoletes may either match against provides, or names. + // Configuration depends on the behaviour of rpm. + bool obsoleteUsesProvides = false; + /////////////////////////////////////////////////////////////////// namespace { ///////////////////////////////////////////////////////////////// - /** WhatObsoletes ctor helper collecting obsoleted installed items. */ - shared_ptr<void> allocatedProviders( sat::Solvable item_r, const sat::detail::IdType *& first_r ) + typedef std::tr1::unordered_set<detail::IdType> set_type; + typedef std::vector<sat::detail::IdType> vector_type; + + ///////////////////////////////////////////////////////////////// + } // namespace + /////////////////////////////////////////////////////////////////// + + WhatObsoletes::WhatObsoletes( Solvable item_r ) + : _begin( 0 ) + { + ctorAdd( item_r ); + ctorDone(); + } + + WhatObsoletes::WhatObsoletes( const PoolItem & item_r ) + : _begin( 0 ) + { + ctorAdd( item_r ); + ctorDone(); + } + + WhatObsoletes::WhatObsoletes( const ResObject::constPtr item_r ) + : _begin( 0 ) + { + if ( item_r ) { - WhatProvides obsoleted( item_r.obsoletes() ); - if ( obsoleted.empty() ) + ctorAdd( item_r->satSolvable() ); + ctorDone(); + } + } + + void WhatObsoletes::ctorAdd( const PoolItem & item_r ) + { ctorAdd( item_r->satSolvable() ); } + + void WhatObsoletes::ctorAdd( ResObject_constPtr item_r ) + { if ( item_r ) ctorAdd( item_r->satSolvable() ); } + + + namespace + { + /** Add item to the set created on demand. */ + inline void addToSet( Solvable item, set_type *& pdata, shared_ptr<void>& _private ) + { + if ( ! pdata ) { - return shared_ptr<void>(); + _private.reset( (pdata = new set_type) ); } + pdata->insert( item.id() ); + } + } - // use allocated private data to store the result (incl. trailing NULL) - std::vector<sat::detail::IdType> * pdata = 0; - shared_ptr<void> ret; + void WhatObsoletes::ctorAdd( Solvable item_r ) + { + if ( obsoleteUsesProvides ) + { + WhatProvides obsoleted( item_r.obsoletes() ); + if ( obsoleted.empty() ) + return; + // use allocated private data to collect the results + set_type * pdata = ( _private ? reinterpret_cast<set_type*>( _private.get() ) : 0 ); for_( it, obsoleted.begin(), obsoleted.end() ) { if ( it->isSystem() ) - { - if ( ! pdata ) - { - ret.reset( (pdata = new std::vector<sat::detail::IdType>) ); - } - pdata->push_back( it->id() ); - } + addToSet( *it, pdata, _private ); } + } + else // Obsoletes match names + { + Capabilities obsoletes( item_r.obsoletes() ); + if ( obsoletes.empty() ) + return; - if ( pdata ) + // use allocated private data to collect the results + set_type * pdata = ( _private ? reinterpret_cast<set_type*>( _private.get() ) : 0 ); + for_( it, obsoletes.begin(), obsoletes.end() ) { - pdata->push_back( sat::detail::noId ); - first_r = &pdata->front(); + // For each obsoletes find providers, but with the same name + IdString ident( it->detail().name() ); + WhatProvides obsoleted( *it ); + for_( iit, obsoleted.begin(), obsoleted.end() ) + { + if ( iit->isSystem() && iit->ident() == ident ) + addToSet( *iit, pdata, _private ); + } } - return ret; } + } - ///////////////////////////////////////////////////////////////// - } // namespace - /////////////////////////////////////////////////////////////////// - - WhatObsoletes::WhatObsoletes( Solvable item_r ) - : _begin( 0 ) - , _private( allocatedProviders( item_r, _begin ) ) - {} + void WhatObsoletes::ctorDone() + { + if ( _private ) + { + // copy set to vector and terminate _private + set_type * sdata = reinterpret_cast<set_type*>( _private.get() ); - WhatObsoletes::WhatObsoletes( const PoolItem & item_r ) - : _begin( 0 ) - , _private( allocatedProviders( item_r.satSolvable(), _begin ) ) - {} + vector_type * pdata = new vector_type( sdata->begin(), sdata->end() ); + pdata->push_back( sat::detail::noId ); + _begin = &pdata->front(); - WhatObsoletes::WhatObsoletes( const ResObject::constPtr item_r ) - : _begin( 0 ) - { - if ( item_r ) - _private = allocatedProviders( item_r->satSolvable(), _begin ); + _private.reset( pdata ); + } } WhatObsoletes::size_type WhatObsoletes::size() const diff --git a/zypp/sat/WhatObsoletes.h b/zypp/sat/WhatObsoletes.h index 7e2af1f..f34efd7 100644 --- a/zypp/sat/WhatObsoletes.h +++ b/zypp/sat/WhatObsoletes.h @@ -31,10 +31,7 @@ namespace zypp /** Container of \b installed \ref Solvable which would be * obsoleted by the \ref Solvable passed to the ctor. * - * \code - * \endcode - * - * \todo Add flag to also add any installed version to the containter. + * \todo Publish obsoleteUsesProvides config option. */ class WhatObsoletes : public SolvIterMixin<WhatObsoletes,detail::WhatProvidesIterator>, protected detail::PoolMember @@ -61,6 +58,16 @@ namespace zypp explicit WhatObsoletes( const ResObject_constPtr item_r ); + /** Ctor from a range of \ref Solvable, \ref PoolItem or \ref ResObject::constPtr. */ + template <class _Iterator> + WhatObsoletes( _Iterator begin, _Iterator end ) + : _begin( 0 ) + { + for_( it, begin, end ) + ctorAdd( *it ); + ctorDone(); + } + public: /** Whether the container is empty. */ bool empty() const @@ -81,6 +88,12 @@ namespace zypp { return const_iterator(); } private: + void ctorAdd( const PoolItem & item_r ); + void ctorAdd( ResObject_constPtr item_r ); + void ctorAdd( Solvable item_r ); + void ctorDone(); + + private: const sat::detail::IdType * _begin; shared_ptr<void> _private; }; -- 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 17 Feb '09

17 Feb '09

ref: refs/heads/master commit c2df51e184cb040984895f579dd31ea159baa8d2 Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Feb 17 14:11:49 2009 +0100 changes --- package/zypper.changes | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/package/zypper.changes b/package/zypper.changes index ca14fcb..e6d8b83 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Sun Feb 15 21:43:13 CET 2009 - jkupec(a)suse.cz + +- Writing additional rpm output after installing/removing packages + (bnc #369450) +- Added ability to change URI in medium error dialog. Dialog help + texts added. + +------------------------------------------------------------------- Thu Feb 12 09:28:00 CET 2009 - jkupec(a)suse.cz - Bash completion: added completion of global options and -- 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 : changes
by Ján Kupec 17 Feb '09

17 Feb '09

ref: refs/heads/SuSE-Code-11-Branch commit e494425416e3bcc34b95df03ae0c23d54aec9649 Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Feb 17 13:14:29 2009 +0100 changes --- VERSION.cmake | 2 +- package/libzypp.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 06ea611..c89eec3 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -51,7 +51,7 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") SET(LIBZYPP_MINOR "27") -SET(LIBZYPP_PATCH "5") +SET(LIBZYPP_PATCH "6") # # LAST RELEASED: 5.27.5 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) diff --git a/package/libzypp.changes b/package/libzypp.changes index 64f6514..26ec838 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Feb 17 13:13:26 CET 2009 - jkupec(a)suse.cz + +- Fixed FTP authentication (bnc #472879) + +------------------------------------------------------------------- Mon Feb 9 13:08:37 CET 2009 - ma(a)suse.de - Fix installation prompting for the wrong CD/DVD. (bnc #472892) -- 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 : Fixed CurlAuthData::valid()
by Ján Kupec 17 Feb '09

17 Feb '09

ref: refs/heads/SuSE-Code-11-Branch commit 27a1e48f1a5e4b8f54ecf56a57102d05d024495a Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Feb 17 12:53:26 2009 +0100 Fixed CurlAuthData::valid() Curl (or FTP itself?) does not provide available authentication types hint. And HTTP can live without an explicit auth type set. Thus, the fix is to consider CurlAuthData with no authentication type set as valid. --- zypp/media/MediaUserAuth.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zypp/media/MediaUserAuth.cc b/zypp/media/MediaUserAuth.cc index 97ca0c0..20f43a1 100644 --- a/zypp/media/MediaUserAuth.cc +++ b/zypp/media/MediaUserAuth.cc @@ -66,7 +66,7 @@ std::ostream & AuthData::dumpAsIniOn( std::ostream & str ) const bool CurlAuthData::valid() const { - return username().size() && password().size() && _auth_type != CURLAUTH_NONE; + return username().size() && password().size(); } -- 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
by Ján Kupec 17 Feb '09

17 Feb '09

ref: refs/heads/master commit 3ed3469ab9b94f1a8b048c3ca38d34b9803647fa Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Feb 17 13:01:55 2009 +0100 changes --- package/libzypp.changes | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/package/libzypp.changes b/package/libzypp.changes index 82bb998..090c7e6 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Feb 17 12:56:57 CET 2009 - jkupec(a)suse.cz + +- Fixed FTP authentication (bnc #472879) + +------------------------------------------------------------------- Wed Feb 11 13:31:03 CET 2009 - ma(a)suse.de - Follow IEC and use the binary prefixes (KiB,MiB,GiB) for printing Byte -- 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 : Fixed CurlAuthData::valid()
by Ján Kupec 17 Feb '09

17 Feb '09

ref: refs/heads/master commit a08b68989c07165ee78049812893479aec19296e Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Feb 17 12:53:26 2009 +0100 Fixed CurlAuthData::valid() Curl (or FTP itself?) does not provide available authentication types hint. And HTTP can live without an explicit auth type set. Thus, the fix is to consider CurlAuthData with no authentication type set as valid. --- zypp/media/MediaUserAuth.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zypp/media/MediaUserAuth.cc b/zypp/media/MediaUserAuth.cc index 97ca0c0..20f43a1 100644 --- a/zypp/media/MediaUserAuth.cc +++ b/zypp/media/MediaUserAuth.cc @@ -66,7 +66,7 @@ std::ostream & AuthData::dumpAsIniOn( std::ostream & str ) const bool CurlAuthData::valid() const { - return username().size() && password().size() && _auth_type != CURLAUTH_NONE; + return username().size() && password().size(); } -- 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> dmacvicar_aria : rename enum to something more readable
by Duncan Mac-Vicar P 16 Feb '09

16 Feb '09

ref: refs/heads/dmacvicar_aria commit d8aef8f35a8d7a0bf7f570fbd4c7b3f68743302c Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Feb 16 15:37:41 2009 +0100 rename enum to something more readable --- zypp/MediaSetAccess.cc | 6 +++--- zypp/MediaSetAccess.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/zypp/MediaSetAccess.cc b/zypp/MediaSetAccess.cc index 7bce993..93b559d 100644 --- a/zypp/MediaSetAccess.cc +++ b/zypp/MediaSetAccess.cc @@ -188,7 +188,7 @@ IMPL_PTR_TYPE(MediaSetAccess); ProvideFileOperation op; resource.setLocation(file, media_nr); try { - provide(boost::ref(op), resource, NON_INTERACTIVE); + provide(boost::ref(op), resource, PROVIDE_NON_INTERACTIVE); } catch ( const Exception &e ) { @@ -203,7 +203,7 @@ IMPL_PTR_TYPE(MediaSetAccess); ProvideFileExistenceOperation op; OnMediaLocation resource; resource.setLocation(file, media_nr); - provide( boost::ref(op), resource, NONE); + provide( boost::ref(op), resource, PROVIDE_DEFAULT); return op.result; } @@ -279,7 +279,7 @@ IMPL_PTR_TYPE(MediaSetAccess); // non interactive only bother the user if wrong medium is in the drive // otherwise propagate the error - if ( ( options & NON_INTERACTIVE ) && reason != media::MediaChangeReport::WRONG) + if ( ( options & PROVIDE_NON_INTERACTIVE ) && reason != media::MediaChangeReport::WRONG) { ZYPP_RETHROW(excp); } diff --git a/zypp/MediaSetAccess.h b/zypp/MediaSetAccess.h index d912a60..24d5b5d 100644 --- a/zypp/MediaSetAccess.h +++ b/zypp/MediaSetAccess.h @@ -113,8 +113,8 @@ namespace zypp /** * The user is not asked anything, and the error * exception is just propagated */ - NONE = 0x0, - NON_INTERACTIVE = 0x1 + PROVIDE_DEFAULT = 0x0, + PROVIDE_NON_INTERACTIVE = 0x1 }; ZYPP_DECLARE_FLAGS(ProvideFileOptions,ProvideFileOption); @@ -142,7 +142,7 @@ namespace zypp * * \see zypp::media::MediaManager::provideFile() */ - Pathname provideFile( const OnMediaLocation & resource, ProvideFileOptions options = NONE ); + Pathname provideFile( const OnMediaLocation & resource, ProvideFileOptions options = PROVIDE_DEFAULT ); /** * Provides \a file from media \a media_nr. @@ -164,7 +164,7 @@ namespace zypp * with the next one, if possible. * \see zypp::media::MediaManager::provideFile() */ - Pathname provideFile(const Pathname & file, unsigned media_nr = 1, ProvideFileOptions options = NONE ); + Pathname provideFile(const Pathname & file, unsigned media_nr = 1, ProvideFileOptions options = PROVIDE_DEFAULT ); /** * \deprecated @@ -218,7 +218,7 @@ namespace zypp * \see zypp::media::MediaManager::provideDir() * \see zypp::media::MediaManager::provideDirTree() */ - Pathname provideDir(const Pathname & dir, bool recursive, unsigned media_nr = 1, ProvideFileOptions options = NONE ); + Pathname provideDir(const Pathname & dir, bool recursive, unsigned media_nr = 1, ProvideFileOptions options = PROVIDE_DEFAULT ); /** * Checks if a file exists on the specified media, with user callbacks. -- 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 : rename enum to something more readable
by Duncan Mac-Vicar P 16 Feb '09

16 Feb '09

ref: refs/heads/master commit d8aef8f35a8d7a0bf7f570fbd4c7b3f68743302c Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Feb 16 15:37:41 2009 +0100 rename enum to something more readable --- zypp/MediaSetAccess.cc | 6 +++--- zypp/MediaSetAccess.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/zypp/MediaSetAccess.cc b/zypp/MediaSetAccess.cc index 7bce993..93b559d 100644 --- a/zypp/MediaSetAccess.cc +++ b/zypp/MediaSetAccess.cc @@ -188,7 +188,7 @@ IMPL_PTR_TYPE(MediaSetAccess); ProvideFileOperation op; resource.setLocation(file, media_nr); try { - provide(boost::ref(op), resource, NON_INTERACTIVE); + provide(boost::ref(op), resource, PROVIDE_NON_INTERACTIVE); } catch ( const Exception &e ) { @@ -203,7 +203,7 @@ IMPL_PTR_TYPE(MediaSetAccess); ProvideFileExistenceOperation op; OnMediaLocation resource; resource.setLocation(file, media_nr); - provide( boost::ref(op), resource, NONE); + provide( boost::ref(op), resource, PROVIDE_DEFAULT); return op.result; } @@ -279,7 +279,7 @@ IMPL_PTR_TYPE(MediaSetAccess); // non interactive only bother the user if wrong medium is in the drive // otherwise propagate the error - if ( ( options & NON_INTERACTIVE ) && reason != media::MediaChangeReport::WRONG) + if ( ( options & PROVIDE_NON_INTERACTIVE ) && reason != media::MediaChangeReport::WRONG) { ZYPP_RETHROW(excp); } diff --git a/zypp/MediaSetAccess.h b/zypp/MediaSetAccess.h index d912a60..24d5b5d 100644 --- a/zypp/MediaSetAccess.h +++ b/zypp/MediaSetAccess.h @@ -113,8 +113,8 @@ namespace zypp /** * The user is not asked anything, and the error * exception is just propagated */ - NONE = 0x0, - NON_INTERACTIVE = 0x1 + PROVIDE_DEFAULT = 0x0, + PROVIDE_NON_INTERACTIVE = 0x1 }; ZYPP_DECLARE_FLAGS(ProvideFileOptions,ProvideFileOption); @@ -142,7 +142,7 @@ namespace zypp * * \see zypp::media::MediaManager::provideFile() */ - Pathname provideFile( const OnMediaLocation & resource, ProvideFileOptions options = NONE ); + Pathname provideFile( const OnMediaLocation & resource, ProvideFileOptions options = PROVIDE_DEFAULT ); /** * Provides \a file from media \a media_nr. @@ -164,7 +164,7 @@ namespace zypp * with the next one, if possible. * \see zypp::media::MediaManager::provideFile() */ - Pathname provideFile(const Pathname & file, unsigned media_nr = 1, ProvideFileOptions options = NONE ); + Pathname provideFile(const Pathname & file, unsigned media_nr = 1, ProvideFileOptions options = PROVIDE_DEFAULT ); /** * \deprecated @@ -218,7 +218,7 @@ namespace zypp * \see zypp::media::MediaManager::provideDir() * \see zypp::media::MediaManager::provideDirTree() */ - Pathname provideDir(const Pathname & dir, bool recursive, unsigned media_nr = 1, ProvideFileOptions options = NONE ); + Pathname provideDir(const Pathname & dir, bool recursive, unsigned media_nr = 1, ProvideFileOptions options = PROVIDE_DEFAULT ); /** * Checks if a file exists on the specified media, with user callbacks. -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0