October 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11514 - /trunk/libzypp/zypp/media/MediaAria2c.cc
by dmacvicar＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: dmacvicar Date: Mon Oct 27 18:51:38 2008 New Revision: 11514 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11514&view=rev Log: - more aria fixes Modified: trunk/libzypp/zypp/media/MediaAria2c.cc Modified: trunk/libzypp/zypp/media/MediaAria2c.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaAria2c.c… ============================================================================== --- trunk/libzypp/zypp/media/MediaAria2c.cc (original) +++ trunk/libzypp/zypp/media/MediaAria2c.cc Mon Oct 27 18:51:38 2008 @@ -123,7 +123,7 @@ static const std::string _value( str::form( - "ZYpp %s (aria2c %s) %s" + "ZYpp %s (%s) %s" , VERSION , MediaAria2c::_aria2cVersion.c_str() , target ? target->targetDistribution().c_str() : "" @@ -193,13 +193,13 @@ // Build the aria command. _args.push_back(_aria2cPath.asString()); - _args.push_back(str::form("--user-agent=\"%s\"", agentString())); + _args.push_back(str::form("--user-agent=%s", agentString())); _args.push_back("--summary-interval=1"); _args.push_back("--follow-metalink=mem"); _args.push_back( "--check-integrity=true"); // add the anonymous id. - _args.push_back(str::form("--header=\"%s\"", anonymousIdHeader() )); + _args.push_back(str::form("--header=%s", anonymousIdHeader() )); // TODO add debug option @@ -238,28 +238,24 @@ { if ( _url.getScheme() == "ftp" ) { - _args.push_back("--ftp-user"); - _args.push_back(_url.getUsername()); + _args.push_back(str::form("--ftp-user=%s", _url.getUsername().c_str() )); } else if ( _url.getScheme() == "http" || _url.getScheme() == "https" ) { - _args.push_back("--http-user"); - _args.push_back(_url.getUsername()); + _args.push_back(str::form("--http-user=%s", _url.getUsername().c_str() )); } if ( _url.getPassword().size() ) { if ( _url.getScheme() == "ftp" ) { - _args.push_back("--ftp-passwd"); - _args.push_back(_url.getPassword()); + _args.push_back(str::form("--ftp-passwd=%s", _url.getPassword().c_str() )); } else if ( _url.getScheme() == "http" || _url.getScheme() == "https" ) { - _args.push_back("--http-passwd"); - _args.push_back(_url.getPassword()); + _args.push_back(str::form("--http-passwd=%s", _url.getPassword().c_str() )); } } } @@ -336,8 +332,7 @@ if ( ! _proxy.empty() ) { - _args.push_back("-âhttp-proxy"); - _args.push_back(_proxy); + _args.push_back(str::form("--http-proxy=%s", _proxy.c_str() )); /*---------------------------------------------------------------* CURLOPT_PROXYUSERPWD: [user name]:[password] @@ -349,22 +344,18 @@ _proxyuserpwd = _url.getQueryParam( "proxyuser" ); if ( ! _proxyuserpwd.empty() ) { - _args.push_back("-âhttp-proxy-user"); - _args.push_back(_proxyuserpwd); + _args.push_back(str::form("--http-proxy-user=%s", _proxyuserpwd.c_str() )); string proxypassword( _url.getQueryParam( "proxypassword" ) ); if ( ! proxypassword.empty() ) { - _args.push_back("-âhttp-proxy-passwd"); - _args.push_back(proxypassword); + _args.push_back(str::form("--http-proxy-passwd=%s", proxypassword.c_str() )); } } } - _currentCookieFile = _cookieFile.asString(); - _args.push_back("-âload-cookies"); - _args.push_back(_currentCookieFile); - - // NOTE cookie jar? + //_currentCookieFile = _cookieFile.asString(); + //_args.push_back(str::form("--load-cookies=%s", _currentCookieFile.c_str())); + //NOTE cookie jar? // FIXME: need a derived class to propelly compare url's MediaSourceRef media( new MediaSource(_url.getScheme(), _url.asString())); @@ -431,7 +422,7 @@ bool retry = false; ExternalProgram::Arguments args = _args; - args.push_back(str::form("--dir=\"%s\"", target.dirname().c_str())); + args.push_back(str::form("--dir=%s", target.dirname().c_str())); args.push_back(fileurl.asString()); do @@ -608,7 +599,7 @@ std::string vResponse = aria.receiveLine(); aria.close(); - return vResponse; + return str::trim(vResponse); } #define ARIA_DEFAULT_BINARY "/usr/bin/aria2c" -- 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] r11513 - in /trunk/libzypp: tests/zypp/Fetcher_test.cc zypp/Fetcher.cc zypp/Fetcher.h
by dmacvicar＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: dmacvicar Date: Mon Oct 27 18:51:36 2008 New Revision: 11513 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11513&view=rev Log: - first refactoring towards real fixing of slideshow bug - refactor the index so any index can be specified - the index supports now relative paths, so the usage of one SHA1SUMS file per tree is also possble Modified: trunk/libzypp/tests/zypp/Fetcher_test.cc trunk/libzypp/zypp/Fetcher.cc trunk/libzypp/zypp/Fetcher.h Modified: trunk/libzypp/tests/zypp/Fetcher_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/Fetcher_test.… ============================================================================== --- trunk/libzypp/tests/zypp/Fetcher_test.cc (original) +++ trunk/libzypp/tests/zypp/Fetcher_test.cc Mon Oct 27 18:51:36 2008 @@ -23,6 +23,28 @@ #define DATADIR (Pathname(TESTS_SRC_DIR) + "/zypp/data/Fetcher/remote-site") +BOOST_AUTO_TEST_CASE(fetcher_simple) +{ + MediaSetAccess media( (DATADIR).asUrl(), "/" ); + Fetcher fetcher; + + { + filesystem::TmpDir dest; + OnMediaLocation loc("/complexdir/subdir1/subdir1-file1.txt"); + loc.setChecksum(CheckSum::sha1("f1d2d2f924e986ac86fdf7b36c94bcdf32beec15")); + fetcher.enqueueDigested(loc); + fetcher.start(dest.path(), media); + fetcher.reset(); + // now we break the checksum and it should fail + loc.setChecksum(CheckSum::sha1("f1d2d2f924e986ac86fdf7b36c94bcdf32beec16")); + fetcher.enqueueDigested(loc); + BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), Exception); + fetcher.reset(); + + } + +} + BOOST_AUTO_TEST_CASE(fetcher) { MediaSetAccess media( ( DATADIR).asUrl(), "/" ); Modified: trunk/libzypp/zypp/Fetcher.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Fetcher.cc?rev=1151… ============================================================================== --- trunk/libzypp/zypp/Fetcher.cc (original) +++ trunk/libzypp/zypp/Fetcher.cc Mon Oct 27 18:51:36 2008 @@ -14,6 +14,7 @@ #include <list> #include <map> +#include "zypp/base/Flags.h" #include "zypp/base/Easy.h" #include "zypp/base/Logger.h" #include "zypp/base/PtrTypes.h" @@ -30,12 +31,27 @@ { ///////////////////////////////////////////////////////////////// /** + * class that represents indexes which add metadata + * to fetcher jobs and therefore need to be retrieved + * in advance. + */ + struct FetcherIndex + { + FetcherIndex( const OnMediaLocation &loc ) + : location(loc) + { + } + + OnMediaLocation location; + }; + typedef shared_ptr<FetcherIndex> FetcherIndex_Ptr; + + /** * Class to encapsulate the \ref OnMediaLocation object * and the \ref FileChecker together */ struct FetcherJob { - FetcherJob( const OnMediaLocation &loc ) : location(loc) , directory(false) @@ -43,7 +59,7 @@ { //MIL << location << endl; } - + ~FetcherJob() { //MIL << location << " | * " << checkers.size() << endl; @@ -77,7 +93,8 @@ ~Impl() { MIL << endl; } - + + void addIndex( const OnMediaLocation &resource ); void enqueue( const OnMediaLocation &resource, const FileChecker &checker = FileChecker() ); void enqueueDir( const OnMediaLocation &resource, bool recursive, const FileChecker &checker = FileChecker() ); void enqueueDigested( const OnMediaLocation &resource, const FileChecker &checker = FileChecker() ); @@ -95,6 +112,20 @@ } private: /** + * download the indexes and reads them + */ + void readIndexes( MediaSetAccess &media, const Pathname &dest_dir); + + /** + * reads a downloaded index file and updates internal + * attributes table + * + * The index lists files relative to a directory, which is + * normally the same as the index file is located. + */ + void readIndex( const Pathname &index, const Pathname &basedir ); + + /** * tries to provide the file represented by job into dest_dir by * looking at the cache. If success, returns true, and the desired * file should be available on dest_dir @@ -123,8 +154,11 @@ Impl * clone() const { return new Impl( *this ); } - std::list<FetcherJob_Ptr> _resources; - std::list<Pathname> _caches; + list<FetcherJob_Ptr> _resources; + list<FetcherIndex_Ptr> _indexes; + list<Pathname> _caches; + // checksums read from the indexes + map<string, CheckSum> _checksums; }; /////////////////////////////////////////////////////////////////// @@ -161,9 +195,19 @@ _resources.push_back(job); } + void Fetcher::Impl::addIndex( const OnMediaLocation &resource ) + { + MIL << "adding index " << resource << endl; + FetcherIndex_Ptr index; + index.reset(new FetcherIndex(resource)); + _indexes.push_back(index); + } + + void Fetcher::Impl::reset() { _resources.clear(); + _indexes.clear(); } void Fetcher::Impl::addCachePath( const Pathname &cache_dir ) @@ -240,14 +284,16 @@ } // iterate over caches return false; } - + void Fetcher::Impl::validate( const OnMediaLocation &resource, const Pathname &dest_dir, const list<FileChecker> &checkers ) { // no matter where did we got the file, try to validate it: Pathname localfile = dest_dir + resource.filename(); // call the checker function - try { + try + { MIL << "Checking job [" << localfile << "] (" << checkers.size() << " checkers )" << endl; + for ( list<FileChecker>::const_iterator it = checkers.begin(); it != checkers.end(); ++it ) @@ -287,93 +333,17 @@ filesystem::DirContent content; media.dirInfo( content, resource.filename(), false /* dots */, resource.medianr()); - filesystem::DirEntry shafile, shasig, shakey; + // only try to add an index if it exists + filesystem::DirEntry shafile; shafile.name = "SHA1SUMS"; shafile.type = filesystem::FT_FILE; - shasig.name = "SHA1SUMS.asc"; shasig.type = filesystem::FT_FILE; - shakey.name = "SHA1SUMS.key"; shakey.type = filesystem::FT_FILE; - - // create a new fetcher with a different state to transfer the - // file containing checksums and its signature - Fetcher fetcher; - // signature checker for SHA1SUMS. We havent got the signature from - // the nextwork yet. - SignatureFileChecker sigchecker; - - // now try to find the SHA1SUMS signature - if ( find(content.begin(), content.end(), shasig) - != content.end() ) - { - MIL << "found checksums signature file: " << shasig.name << endl; - // TODO refactor with OnMediaLocation::extend or something - fetcher.enqueue( OnMediaLocation(resource.filename() + shasig.name, resource.medianr()).setOptional(true) ); - assert_dir(dest_dir + resource.filename()); - fetcher.start( dest_dir, media ); - - // if we get the signature, update the checker - sigchecker = SignatureFileChecker(dest_dir + resource.filename() + shasig.name); - fetcher.reset(); - } - else - MIL << "no signature for " << shafile.name << endl; - - // look for the SHA1SUMS.key file - if ( find(content.begin(), content.end(), shakey) - != content.end() ) - { - MIL << "found public key file: " << shakey.name << endl; - fetcher.enqueue( OnMediaLocation(resource.filename() + shakey.name, resource.medianr()).setOptional(true) ); - assert_dir(dest_dir + resource.filename()); - fetcher.start( dest_dir, media ); - fetcher.reset(); - KeyContext context; - sigchecker.addPublicKey(dest_dir + resource.filename() + shakey.name, context); - } - - // look for the SHA1SUMS public key file - if ( find(content.begin(), content.end(), shafile) - != content.end() ) - { - MIL << "found checksums file: " << shafile.name << endl; - fetcher.enqueue( OnMediaLocation(resource.filename() + shafile.name, resource.medianr()).setOptional(true) ); - assert_dir(dest_dir + resource.filename()); - fetcher.start( dest_dir, media ); - fetcher.reset(); - } - - // hash table to store checksums - map<string, CheckSum> checksums; - - // look for the SHA1SUMS file - if ( find(content.begin(), content.end(), shafile) != content.end() ) - { - MIL << "found checksums file: " << shafile.name << endl; - fetcher.enqueue( OnMediaLocation( - resource.filename() + shafile.name, - resource.medianr()).setOptional(true), - FileChecker(sigchecker) ); - assert_dir(dest_dir + resource.filename()); - fetcher.start( dest_dir + resource.filename(), media ); - fetcher.reset(); - - // now read the SHA1SUMS file - Pathname pShafile = dest_dir + resource.filename() + shafile.name; - std::ifstream in( pShafile.c_str() ); - string buffer; - if ( ! in.fail() ) - { - while ( getline(in, buffer) ) - { - vector<string> words; - str::split( buffer, back_inserter(words) ); - if ( words.size() != 2 ) - ZYPP_THROW(Exception("Wrong format for SHA1SUMS file")); - //MIL << "check: '" << words[0] << "' | '" << words[1] << "'" << endl; - if ( ! words[1].empty() ) - checksums[words[1]] = CheckSum::sha1(words[0]); - } - } - else - ZYPP_THROW(Exception("Can't open SHA1SUMS file: " + pShafile.asString())); + if ( find( content.begin(), content.end(), shafile ) != content.end() ) + { + // add the index of this directory + OnMediaLocation indexloc(resource); + indexloc.changeFilename(resource.filename() + "SHA1SUMS"); + addIndex(indexloc); + // we need to read it now + readIndexes(media, dest_dir); } for ( filesystem::DirContent::const_iterator it = content.begin(); @@ -391,17 +361,17 @@ case filesystem::FT_NOT_AVAIL: // old directory.yast contains no typeinfo at all case filesystem::FT_FILE: { - CheckSum checksum; - if ( checksums.find(it->name) != checksums.end() ) - checksum = checksums[it->name]; - - // create a resource from the file - // if checksum was not available we will have a empty - // checksum, which will end in a validation anyway - // warning the user that there is no checksum - enqueueDigested(OnMediaLocation(filename, resource.medianr()) - .setChecksum(checksum)); + CheckSum chksm(resource.checksum()); + if ( _checksums.find(filename.asString()) != _checksums.end() ) + { + // the checksum can be replaced with the one in the index. + chksm = _checksums[filename.asString()]; + //MIL << "resource " << filename << " has checksum in the index file." << endl; + } + else + WAR << "Resource " << filename << " has no checksum in the index either." << endl; + enqueueDigested(OnMediaLocation(filename, resource.medianr()).setChecksum(chksm)); break; } case filesystem::FT_DIR: // newer directory.yast contain at least directory info @@ -455,6 +425,82 @@ } } + void Fetcher::Impl::readIndex( const Pathname &index, const Pathname &basedir ) + { + std::ifstream in( index.c_str() ); + string buffer; + if ( ! in.fail() ) + { + while ( getline(in, buffer) ) + { + vector<string> words; + str::split( buffer, back_inserter(words) ); + if ( words.size() != 2 ) + ZYPP_THROW(Exception("Wrong format for SHA1SUMS file")); + //MIL << "check: '" << words[0] << "' | '" << words[1] << "'" << endl; + if ( ! words[1].empty() ) + _checksums[(basedir + words[1]).asString()] = CheckSum::sha1(words[0]); + } + } + else + ZYPP_THROW(Exception("Can't open SHA1SUMS file: " + index.asString())); + } + + void Fetcher::Impl::readIndexes( MediaSetAccess &media, const Pathname &dest_dir) + { + // if there is no indexes, then just return to avoid + // the directory listing + if ( _indexes.empty() ) + { + MIL << "No indexes to read." << endl; + return; + } + + // create a new fetcher with a different state to transfer the + // file containing checksums and its signature + Fetcher fetcher; + // signature checker for index. We havent got the signature from + // the nextwork yet. + SignatureFileChecker sigchecker; + + for ( list<FetcherIndex_Ptr>::const_iterator it_idx = _indexes.begin(); + it_idx != _indexes.end(); ++it_idx ) + { + MIL << "reading index " << (*it_idx)->location << endl; + // build the name of the index and the signature + OnMediaLocation idxloc((*it_idx)->location); + OnMediaLocation sigloc((*it_idx)->location.setOptional(true)); + OnMediaLocation keyloc((*it_idx)->location.setOptional(true)); + + // calculate signature and key name + sigloc.changeFilename( sigloc.filename().extend(".asc") ); + keyloc.changeFilename( keyloc.filename().extend(".key") ); + + //assert_dir(dest_dir + idxloc.filename().dirname()); + + // transfer the signature + fetcher.enqueue(sigloc); + fetcher.start( dest_dir, media ); + // if we get the signature, update the checker + sigchecker = SignatureFileChecker(dest_dir + sigloc.filename()); + fetcher.reset(); + + // now the key + fetcher.enqueue(keyloc); + fetcher.start( dest_dir, media ); + fetcher.reset(); + + // now the index itself + fetcher.enqueue( idxloc, FileChecker(sigchecker) ); + fetcher.start( dest_dir, media ); + fetcher.reset(); + + // now we have the indexes in dest_dir + readIndex( dest_dir + idxloc.filename(), idxloc.filename().dirname() ); + } + MIL << "done reading indexes" << endl; + } + void Fetcher::Impl::start( const Pathname &dest_dir, MediaSetAccess &media, const ProgressData::ReceiverFnc & progress_receiver ) @@ -462,6 +508,8 @@ ProgressData progress(_resources.size()); progress.sendTo(progress_receiver); + readIndexes(media, dest_dir); + for ( list<FetcherJob_Ptr>::const_iterator it_res = _resources.begin(); it_res != _resources.end(); ++it_res ) { @@ -527,6 +575,12 @@ _pimpl->enqueueDir(resource, recursive, checker); } + void Fetcher::addIndex( const OnMediaLocation &resource ) + { + _pimpl->addIndex(resource); + } + + void Fetcher::enqueue( const OnMediaLocation &resource, const FileChecker &checker ) { _pimpl->enqueue(resource, checker); Modified: trunk/libzypp/zypp/Fetcher.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Fetcher.h?rev=11513… ============================================================================== --- trunk/libzypp/zypp/Fetcher.h (original) +++ trunk/libzypp/zypp/Fetcher.h Mon Oct 27 18:51:36 2008 @@ -76,6 +76,23 @@ virtual ~Fetcher(); public: + + + /** + * Adds an index containing metadata (for example + * checksums ) that will be retrieved and read + * before the job processing starts. + * + * Nothing will be transfered or checked + * until \ref start() is called. + * + * The index is relative to the media path, and + * the listed files too. + * + */ + void addIndex( const OnMediaLocation &resource ); + + /** * Enqueue a object for transferal, they will not * be transfered until \ref start() is called -- 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] r11512 - in /trunk/libzypp: devel/devel.ma/CMakeLists.txt devel/devel.ma/TransList.cc zypp/CMakeLists.txt zypp/parser/ProductFileReader.cc zypp/parser/ProductFileReader.h
by mlandres＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: mlandres Date: Mon Oct 27 18:30:11 2008 New Revision: 11512 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11512&view=rev Log: ProductFileReader skeleton Added: trunk/libzypp/zypp/parser/ProductFileReader.cc trunk/libzypp/zypp/parser/ProductFileReader.h Modified: trunk/libzypp/devel/devel.ma/CMakeLists.txt trunk/libzypp/devel/devel.ma/TransList.cc trunk/libzypp/zypp/CMakeLists.txt Modified: trunk/libzypp/devel/devel.ma/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/CMakeList… ============================================================================== --- trunk/libzypp/devel/devel.ma/CMakeLists.txt (original) +++ trunk/libzypp/devel/devel.ma/CMakeLists.txt Mon Oct 27 18:30:11 2008 @@ -24,7 +24,7 @@ ## ############################################################ -FOREACH( loop_var MaTest NewPool DumpSolv Iorder Xml Ex Main FakePool AOUT Parse Test Basic Sat) +FOREACH( loop_var MaTest NewPool DumpSolv Iorder Xml Ex Main FakePool AOUT Parse Test Basic Sat TransList) ADD_EXECUTABLE( ${loop_var} ${loop_var}.cc ) Modified: trunk/libzypp/devel/devel.ma/TransList.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/TransList… ============================================================================== --- trunk/libzypp/devel/devel.ma/TransList.cc (original) +++ trunk/libzypp/devel/devel.ma/TransList.cc Mon Oct 27 18:30:11 2008 @@ -28,9 +28,7 @@ #include "zypp/parser/xml/ParseDef.h" #include "zypp/parser/xml/ParseDefConsume.h" -#include "zypp/ZYppFactory.h" -#include "zypp/SysContent.h" - +#include "zypp/parser/ProductFileReader.h" using namespace std; using namespace zypp; @@ -178,26 +176,11 @@ } // namespace zypp /////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// -namespace zypp -{ ///////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// - namespace syscontent - { ///////////////////////////////////////////////////////////////// - std::ostream & operator<<( std::ostream & str, const Reader::Entry & obj ) - { - str << "[" << obj.kind() << "]" - << " " << obj.name() - << "-" << obj.edition() - << "." << obj.arch(); - return str; - } - ///////////////////////////////////////////////////////////////// - } // namespace syscontent - /////////////////////////////////////////////////////////////////// - ///////////////////////////////////////////////////////////////// -} // namespace zypp -/////////////////////////////////////////////////////////////////// +bool Consumer( const parser::ProductFileData & data_r ) +{ + MIL << data_r << endl; + return true; +} /****************************************************************** ** @@ -208,6 +191,12 @@ { INT << "===[START]==========================================" << endl; + { + Measure x( "PARSE" ); + USR << parser::ProductFileReader::scanDir( &Consumer, sysRoot / "etc/products.d" ) << endl; + } + +#if 0 bool write = false; bool read = true; @@ -257,7 +246,7 @@ for_each( contentR.begin(), contentR.end(), Print() ); } - +#endif INT << "===[END]============================================" << endl << endl; zypp::base::LogControl::instance().logNothing(); return 0; Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=… ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Mon Oct 27 18:30:11 2008 @@ -318,6 +318,7 @@ parser/RepoFileReader.cc parser/RepoindexFileReader.cc parser/ServiceFileReader.cc + parser/ProductFileReader.cc ) SET( zypp_parser_HEADERS @@ -329,6 +330,7 @@ parser/xml_escape_parser.hpp parser/RepoindexFileReader.h parser/ServiceFileReader.h + parser/ProductFileReader.h ) INSTALL( FILES Added: trunk/libzypp/zypp/parser/ProductFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/ProductFileR… ============================================================================== --- trunk/libzypp/zypp/parser/ProductFileReader.cc (added) +++ trunk/libzypp/zypp/parser/ProductFileReader.cc Mon Oct 27 18:30:11 2008 @@ -0,0 +1,165 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/parser/ProductFileReader.cc + * +*/ +#include <iostream> +#include "zypp/base/Logger.h" +#include "zypp/base/Exception.h" + +#include "zypp/PathInfo.h" + +#include "zypp/parser/ProductFileReader.h" +#include "zypp/parser/xml/Reader.h" + +using std::endl; + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace parser + { ///////////////////////////////////////////////////////////////// + + ///////////////////////////////////////////////////////////////// + // + // class ProductFileData::Upgrade + // + ///////////////////////////////////////////////////////////////// + + struct ProductFileData::Upgrade::Impl + { + std::string _name; + std::string _summary; + std::string _product; + DefaultIntegral<bool,false> _notify; + std::string _status; + }; + + ProductFileData::Upgrade::Upgrade( Impl * allocated_r ) + : _pimpl( allocated_r ? allocated_r : new Impl ) + {} + + std::string ProductFileData::Upgrade::name() const { return _pimpl->_name; } + std::string ProductFileData::Upgrade::summary() const { return _pimpl->_summary; } + std::string ProductFileData::Upgrade::product() const { return _pimpl->_product; } + bool ProductFileData::Upgrade::notify() const { return _pimpl->_notify; } + std::string ProductFileData::Upgrade::status() const { return _pimpl->_status; } + + ///////////////////////////////////////////////////////////////// + // + // class ProductFileData + // + ///////////////////////////////////////////////////////////////// + + struct ProductFileData::Impl + { + IdString _vendor; + IdString _name; + Edition _edition; + Arch _arch; + + std::string _productline; + std::string _registerTarget; + std::string _registerRelease; + + std::string _updaterepokey; + + Upgrades _upgrades; + }; + + ProductFileData::ProductFileData( Impl * allocated_r ) + : _pimpl( allocated_r ? allocated_r : new Impl ) + {} + + IdString ProductFileData::vendor() const { return _pimpl->_vendor; } + IdString ProductFileData::name() const { return _pimpl->_name; } + Edition ProductFileData::edition() const { return _pimpl->_edition; } + Arch ProductFileData::arch() const { return _pimpl->_arch; } + + std::string ProductFileData::productline() const { return _pimpl->_productline; } + std::string ProductFileData::registerTarget() const { return _pimpl->_registerTarget; } + std::string ProductFileData::registerRelease() const { return _pimpl->_registerRelease; } + + std::string ProductFileData::updaterepokey() const { return _pimpl->_updaterepokey; } + + const ProductFileData::Upgrades & ProductFileData::upgrades() const { return _pimpl->_upgrades; } + + std::ostream & operator<<( std::ostream & str, const ProductFileData & obj ) + { + str << str::form( "|product|%s|%s|%s|%s|", + obj.name().c_str(), + obj.edition().c_str(), + obj.arch().c_str(), + obj.vendor().c_str() ); + return str; + } + + ///////////////////////////////////////////////////////////////// + // + // class ProductFileReader + // + ///////////////////////////////////////////////////////////////// + bool consumeNode( xml::Reader & reader_r ) + { + //DBG << *reader_r << endl; + return true; + } + + bool ProductFileReader::parse( const InputStream & input_r ) const + { + INT << "+++" << input_r << endl; + bool ret = true; + try + { + xml::Reader reader( input_r ); + ret = reader.foreachNode( consumeNode ); + } + catch ( const Exception & err ) + { + // parse error + ERR << err << endl; + } + INT << "---" << ret << " - " << input_r << endl; + return ret; + } + + bool ProductFileReader::scanDir( const Consumer & consumer_r, const Pathname & dir_r ) + { + DBG << "+++ scanDir " << dir_r << endl; + std::list<Pathname> retlist; + int res = filesystem::readdir( retlist, dir_r, /*dots*/false ); + if ( res != 0 ) + { + WAR << "scanDir " << dir_r << " failed (" << res << ")" << endl; + return true; + } + + ProductFileReader reader( consumer_r ); + for_( it, retlist.begin(), retlist.end() ) + { + if ( PathInfo( *it, PathInfo::LSTAT ).isFile() && ! reader.parse( *it ) ) + { + return false; // consumer_r request to stop parsing. + } + } + DBG << "--- scanDir " << dir_r << endl; + return true; + } + + ProductFileData ProductFileReader::scanFile( const Pathname & dir_r ) + { + } + + ///////////////////////////////////////////////////////////////// + } // namespace parser + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// Added: trunk/libzypp/zypp/parser/ProductFileReader.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/ProductFileR… ============================================================================== --- trunk/libzypp/zypp/parser/ProductFileReader.h (added) +++ trunk/libzypp/zypp/parser/ProductFileReader.h Mon Oct 27 18:30:11 2008 @@ -0,0 +1,157 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/parser/ProductFileReader.h + * +*/ +#ifndef ZYPP_PARSER_PRODUCTSDREADER_H +#define ZYPP_PARSER_PRODUCTSDREADER_H + +#include <iosfwd> + +#include "zypp/base/PtrTypes.h" +#include "zypp/base/Function.h" +#include "zypp/base/InputStream.h" + +#include "zypp/Pathname.h" +#include "zypp/IdString.h" +#include "zypp/Edition.h" +#include "zypp/Arch.h" + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace parser + { ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : ProductFileData + // + /** Data returned by \ref ProductFileReader + * \see \ref ProductFileReader + */ + class ProductFileData + { + public: + class Impl; + /** Ctor takes ownership of \c allocated_r. */ + ProductFileData( Impl * allocated_r = 0 ); + + public: + IdString vendor() const; + IdString name() const; + Edition edition() const; + Arch arch() const; + + public: + std::string productline() const; + std::string registerTarget() const; + std::string registerRelease() const; + + public: + std::string updaterepokey() const; + + public: + /////////////////////////////////////////////////////////////////// + struct Upgrade + { + public: + class Impl; + /** Ctor takes ownership of \c allocated_r. */ + Upgrade( Impl * allocated_r = 0 ); + + public: + std::string name() const; + std::string summary() const; + std::string product() const; + bool notify() const; + std::string status() const; + + private: + RWCOW_pointer<Impl> _pimpl; + }; + /////////////////////////////////////////////////////////////////// + + typedef std::vector<Upgrade> Upgrades; + const Upgrades & upgrades() const; + + private: + RWCOW_pointer<Impl> _pimpl; + }; + /////////////////////////////////////////////////////////////////// + + /** \relates ProductFileData Stream output */ + std::ostream & operator<<( std::ostream & str, const ProductFileData & obj ); + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : ProductFileReader + // + /** Parser for /etc/products.d enries (just relevant entires). + */ + class ProductFileReader + { + public: + /** Callback being invoked for each \ref ProductFileData parsed. + * Return \c false to stop parsing. + */ + typedef function<bool( const ProductFileData & )> Consumer; + + public: + ProductFileReader() + {} + + ProductFileReader( const Consumer & consumer_r ) + : _consumer( consumer_r ) + {} + + ProductFileReader( const Consumer & consumer_r, const InputStream & input_r ) + : _consumer( consumer_r ) + { parse( input_r ); } + + public: + const Consumer & consumer() const + { return _consumer; } + + void setConsumer( const Consumer & consumer_r ) + { _consumer = consumer_r; } + + public: + /** Parse the input stream and call \c _consumer for each + * parsed section. + * + * Returns \c false if the \c _consumer requested to stop parsing. + */ + bool parse( const InputStream & input_r = InputStream() ) const; + + public: + /** Parse all files (no symlinks) in \c dir_r and call \c consumer_r + * for each \ref ProductFileData parsed. + * + * Returns \c false if the \c _consumer requested to stop parsing. + */ + static bool scanDir( const Consumer & consumer_r, const Pathname & dir_r ); + + /** Parse one file (or symlink) and return the \ref ProductFileData parsed. + */ + static ProductFileData scanFile( const Pathname & dir_r ); + + private: + Consumer _consumer; + }; + /////////////////////////////////////////////////////////////////// + + ///////////////////////////////////////////////////////////////// + } // namespace parser + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// +#endif // ZYPP_PARSER_PRODUCTSDREADER_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] r11511 - /trunk/zypper/src/Zypper.cc
by jkupec＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: jkupec Date: Mon Oct 27 18:22:42 2008 New Revision: 11511 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11511&view=rev Log: - fix text Modified: trunk/zypper/src/Zypper.cc Modified: trunk/zypper/src/Zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=11511&r… ============================================================================== --- trunk/zypper/src/Zypper.cc (original) +++ trunk/zypper/src/Zypper.cc Mon Oct 27 18:22:42 2008 @@ -513,7 +513,7 @@ if (gopts.count("no-remote")) { _gopts.no_remote = true; - out().info(_("Remote repos disabled."), Out::HIGH); + out().info(_("Remote repositories disabled."), Out::HIGH); MIL << "No remote repos." << 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] r11510 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: jkupec Date: Mon Oct 27 17:17:19 2008 New Revision: 11510 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11510&view=rev Log: - changes Modified: trunk/zypper/package/zypper.changes Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Mon Oct 27 17:17:19 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Oct 27 17:16:17 CET 2008 - jkupec(a)suse.cz + +- use /dev/tty for input, instead of stdin +- do not return default value in prompts, if user input + is expected and EOF received (bnc #436963) +- r11509 + +------------------------------------------------------------------- Mon Oct 27 15:15:57 CET 2008 - jkupec(a)suse.cz - force installation by capability if name.arch is specified -- 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] r11509 - /trunk/zypper/src/utils/prompt.cc
by jkupec＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: jkupec Date: Mon Oct 27 17:15:08 2008 New Revision: 11509 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11509&view=rev Log: - use /dev/tty for input, instead of stdin - do not return default value in prompts, if user input is expected and EOF received (bnc #436963) Modified: trunk/zypper/src/utils/prompt.cc Modified: trunk/zypper/src/utils/prompt.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/utils/prompt.cc?rev=1… ============================================================================== --- trunk/zypper/src/utils/prompt.cc (original) +++ trunk/zypper/src/utils/prompt.cc Mon Oct 27 17:15:08 2008 @@ -1,6 +1,7 @@ #include <ctype.h> #include <iostream> #include <sstream> +#include <fstream> #include <poll.h> #include <readline/readline.h> //#include <unistd.h> @@ -36,12 +37,12 @@ void PromptOptions::setOptions(const std::string & option_str, unsigned int default_opt) { - zypp::str::split(option_str, back_inserter(_options), "/"); + zypp::str::split(option_str, back_inserter(_options), "/"); if (_options.size() <= default_opt) INT << "Invalid default option index " << default_opt << endl; else - _default = default_opt; + _default = default_opt; } const string PromptOptions::optionString() const @@ -55,7 +56,7 @@ } for (unsigned int i = 1; it != options().end(); ++it, i++) option_str += "/" + (defaultOpt() == i ? zypp::str::toUpper(*it) : *it); - + if (!_opt_help.empty()) option_str += "/?"; @@ -97,7 +98,7 @@ } out.info (_("Abort, retry, ignore?\n")); - + //FIXME XML output cout << endl; @@ -138,7 +139,7 @@ sleep(1); timeout--; } - + return default_action; } @@ -187,7 +188,10 @@ return poptions.defaultOpt(); } - istream & stm = cin; + // open a terminal for input (bnc #436963) + ifstream stm("/dev/tty", ifstream::in); + // istream & stm = cin; + bool is_yn_prompt = poptions.options().size() == 2 && poptions.options()[0] == _("yes") && @@ -225,7 +229,7 @@ for (unsigned int i = 0; i < poptions.options().size(); i++) { DBG << "index: " << i << " option: " - << poptions.options()[i] << endl; + << poptions.options()[i] << endl; if (poptions.options()[i] == zypp::str::toLower(reply)) { reply_int = i; @@ -252,18 +256,23 @@ zypper.out().prompt(pid, s.str(), poptions); } - if (!stmgood) + // if we cannot read input or it is at EOF (bnc #436963), exit + if (!stmgood || stm.eof()) { - WAR << "Could not read the answer, returning the default: " - << poptions.options()[poptions.defaultOpt()] << " (" << reply_int << ")" - << endl; - return poptions.defaultOpt(); + WAR << "Could not read the answer - bad stream or EOF" << endl; + zypper.out().error( + "Cannot read input: bad stream or EOF.", + zypp::str::form(_( +"If you run zypper without a terminal, use '%s' global\n" +"option to make zypper use default answers to prompts." + ), "--non-interactive")); + throw ExitRequestException("Cannot read input. Bad stream or EOF."); } if (reply.empty()) MIL << "reply empty, returning the default: " << poptions.options()[poptions.defaultOpt()] << " (" << reply_int << ")" - << endl; + << endl; else MIL << "reply: " << reply << " (" << reply_int << ")" << endl; @@ -289,7 +298,7 @@ { // A static variable for holding the line. static char * line_read = NULL; - + prefill = prefilled.c_str(); /* If the buffer has already been allocated, @@ -310,7 +319,7 @@ return string(); } -static int silent_getch ( void ) +static int silent_getch ( void ) { int ch; struct termios oldt, newt; @@ -334,7 +343,7 @@ char pw[20]; unsigned i = 0; - while ((ch = silent_getch()) != EOF + while ((ch = silent_getch()) != EOF && ch != '\n' && ch != '\r' && i < sizeof(pw) - 1) -- 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] r11508 - /trunk/libzypp/zypp/parser/xml/Reader.h
by mlandres＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: mlandres Date: Mon Oct 27 16:40:37 2008 New Revision: 11508 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11508&view=rev Log: typo Modified: trunk/libzypp/zypp/parser/xml/Reader.h Modified: trunk/libzypp/zypp/parser/xml/Reader.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/xml/Reader.h… ============================================================================== --- trunk/libzypp/zypp/parser/xml/Reader.h (original) +++ trunk/libzypp/zypp/parser/xml/Reader.h Mon Oct 27 16:40:37 2008 @@ -103,9 +103,9 @@ ~Reader(); public: - - /** - * If the cuurent node is not empty, advances the reader to the next + + /** + * If the curent node is not empty, advances the reader to the next * node, and returns the value * * \note if the node has a xml subtree you will probably jump to that node @@ -113,7 +113,7 @@ * has no XML subtree. */ XmlString nodeText(); - + /** */ bool nextNode(); -- 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] r11507 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: jkupec Date: Mon Oct 27 15:17:10 2008 New Revision: 11507 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11507&view=rev Log: - changes Modified: trunk/zypper/package/zypper.changes Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Mon Oct 27 15:17:10 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Oct 27 15:15:57 CET 2008 - jkupec(a)suse.cz + +- force installation by capability if name.arch is specified + (bnc #305445) +- complain if installing by --name and arch is specified +- r11506 + +------------------------------------------------------------------- Mon Oct 27 14:07:00 CET 2008 - jkupec(a)suse.cz - --no-cd global option added to ignore CD/DVD repositories -- 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] r11506 - in /trunk/zypper: doc/zypper.8 src/Zypper.cc src/install.cc
by jkupec＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: jkupec Date: Mon Oct 27 15:16:04 2008 New Revision: 11506 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11506&view=rev Log: - force installation by capability if name.arch is specified (bnc #305445) - complain if installing by --name and arch is specified Modified: trunk/zypper/doc/zypper.8 trunk/zypper/src/Zypper.cc trunk/zypper/src/install.cc Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=11506&r1… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Mon Oct 27 15:16:04 2008 @@ -158,8 +158,9 @@ The packages can be selected by their name or by a capability they provide. -Capability is: NAME, or "NAME[OP<EDITION>]", where OP is <, <=, =, >=, or > and -EDITION is VERSION[-RELEASE], for example: zypper=0.8.8-2. +Capability is: NAME, or "NAME[.ARCH][OP<EDITION>]", where ARCH is architecture +code, OP is <, <=, =, >=, or > and EDITION is VERSION[-RELEASE]. +For example: zypper=0.8.8-2. The NAME component of a capability is not only a package name but any symbol provided by packages: /bin/vi, libcurl.so.3, perl(Time::ParseDate). @@ -170,6 +171,11 @@ This also means that if the package is already installed and newer versions are available, it will get upgraded to the newest installable version. +If ARCH is not specified, or the last dot of the capability name string is not +followed by known architecture, the solver will treat the whole string +as a capability name. If the ARCH is know, the solver will try to choose +a package with the best compatible architecture to the one specified. + Zypper is also able to install plain RPM files while trying to satisfy their dependencies using packages from defined repositories. You can install a plain RPM file by specifying its location in the install command arguments either Modified: trunk/zypper/src/Zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=11506&r… ============================================================================== --- trunk/zypper/src/Zypper.cc (original) +++ trunk/zypper/src/Zypper.cc Mon Oct 27 15:16:04 2008 @@ -876,6 +876,8 @@ _command_help = str::form(_( // TranslatorExplanation the first %s = "package, patch, pattern, product" // and the second %s = "package" + //! \todo A capability is NAME[.ARCH][OP<VERSION>] now, + //! the help text will be changed after release "install (in) [options] <capability|rpm_file_uri> ...\n" "\n" "Install packages with specified capabilities or RPM files with" Modified: trunk/zypper/src/install.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/install.cc?rev=11506&… ============================================================================== --- trunk/zypper/src/install.cc (original) +++ trunk/zypper/src/install.cc Mon Oct 27 15:16:04 2008 @@ -511,12 +511,34 @@ if ((pos = str.rfind('.')) != string::npos) { arch = str.substr(pos + 1); - str = str.substr(0, pos); + //str = str.substr(0, pos); if (Arch(arch).isBuiltIn()) - force_by_name = true; // until there is a solver API for this + { + if (force_by_name) + { + zypper.out().error( + _("Specifying architecture when selecting packages by name" + " is not implemented.")); + zypper.setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); + throw ExitRequestException(); + } + + // name.arch is a valid capability since libzypp-4.15.0 (bnc #305445) + by_capability = true; + } else + { DBG << "Unknown arch (" << arch << ") in package " << str - << ", will treat it like capability name." << endl; + << ", will treat it like part of the name" << endl; + /* + zypper.out().error( + str::form(_("Unknown architecture '%s'"), arch.c_str()), + _("When selecting packages by name, the last dot character must be followed\n" + "by a valid architecture code.")); + zypper.setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); + throw ExitRequestException(); + */ + } } // mark by name by force -- 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] r11505 - in /branches/SuSE-Linux-11_0-Branch/libzypp: VERSION.cmake package/libzypp.changes zypp/RepoManager.cc
by mlandres＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: mlandres Date: Mon Oct 27 14:56:24 2008 New Revision: 11505 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11505&view=rev Log: - Rewrote repo2solv.sh call to use execv, getting rid of any need for argument quoting. (#439058) Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes branches/SuSE-Linux-11_0-Branch/libzypp/zypp/RepoManager.cc Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake Mon Oct 27 14:56:24 2008 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "27") SET(LIBZYPP_COMPATMINOR "24") -SET(LIBZYPP_PATCH "3") +SET(LIBZYPP_PATCH "4") Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Mon Oct 27 14:56:24 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Oct 27 14:51:59 CET 2008 - ma(a)suse.de + +- Rewrote repo2solv.sh call to use execv, getting rid of any need + for argument quoting. (#439058) +- revision 11505 +- version 4.27.4 + +------------------------------------------------------------------- Wed Oct 15 15:31:40 CEST 2008 - ma(a)suse.de - Fix quoting of arguments passed in repo2solv.sh calls (bnc #420046) Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/RepoManager.cc (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/RepoManager.cc Mon Oct 27 14:56:24 2008 @@ -18,7 +18,7 @@ #include <map> #include <algorithm> #include "zypp/base/InputStream.h" -#include "zypp/base/Logger.h" +#include "zypp/base/LogTools.h" #include "zypp/base/Gettext.h" #include "zypp/base/Function.h" #include "zypp/base/Regex.h" @@ -772,38 +772,42 @@ case RepoType::RPMMD_e : case RepoType::YAST2_e : case RepoType::RPMPLAINDIR_e : - { + { // Take care we unlink the solvfile on exception ManagedFile guard( solvfile, filesystem::unlink ); - ostringstream cmd; - std::string toFile( str::gsub(solvfile.asString(),"\"","\\\"") ); - if ( repokind.toEnum() == RepoType::RPMPLAINDIR_e ) - { - cmd << str::form( "repo2solv.sh '%s' > '%s'", - info.baseUrlsBegin()->getPathName().c_str(), - toFile.c_str() ); - } + std::string inputpath; + if ( repokind == RepoType::RPMPLAINDIR ) + // FIXME this does only work form dir: URLs + inputpath = info.baseUrlsBegin()->getPathName(); else - { - cmd << str::form( "repo2solv.sh '%s' > '%s'", - rawpath.asString().c_str(), - toFile.c_str() ); - } - MIL << "Executing: " << cmd.str() << endl; - ExternalProgram prog( cmd.str(), ExternalProgram::Stderr_To_Stdout ); + inputpath = rawpath.asString(); + + const char * cmd[] = { + "repo2solv.sh", + "-o", // repo2solv expects -o as 1st arg! + solvfile.asString().c_str(), + inputpath.c_str(), + NULL + }; - cmd << endl; - for ( string output( prog.receiveLine() ); output.length(); output = prog.receiveLine() ) { + ExternalProgram prog( cmd, ExternalProgram::Stderr_To_Stdout ); + std::string errdetail; + + for ( std::string output( prog.receiveLine() ); output.length(); output = prog.receiveLine() ) { WAR << " " << output; - cmd << " " << output; + if ( errdetail.empty() ) { + errdetail = prog.command(); + errdetail += '\n'; + } + errdetail += output; } int ret = prog.close(); if ( ret != 0 ) { RepoException ex(str::form("Failed to cache repo (%d).", ret)); - ex.remember( cmd.str() ); + ex.remember( errdetail ); ZYPP_THROW(ex); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0