December 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11934 - /trunk/sat-solver/src/solver.c
by mlschroe＠svn.opensuse.org 16 Dec '08

16 Dec '08

Author: mlschroe Date: Tue Dec 16 18:53:22 2008 New Revision: 11934 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11934&view=rev Log: - filter packages from recommended package list that are obsoleted by installed packages (bnc#456756) Modified: trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=1193… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Tue Dec 16 18:53:22 2008 @@ -2883,6 +2883,40 @@ } } + /* filter out all packages obsoleted by installed packages */ + /* this is no longer needed if we have reverse obsoletes */ + if ((dqs.count || dq.count) && solv->installed) + { + Map obsmap; + Id obs, *obsp, po, ppo; + + map_init(&obsmap, pool->nsolvables); + for (p = solv->installed->start; p < solv->installed->end; p++) + { + s = pool->solvables + p; + if (s->repo != solv->installed || !s->obsoletes) + continue; + if (solv->decisionmap[p] <= 0) + continue; + if (solv->noobsoletes.size && MAPTST(&solv->noobsoletes, p)) + continue; + obsp = s->repo->idarraydata + s->obsoletes; + /* foreach obsoletes */ + while ((obs = *obsp++) != 0) + FOR_PROVIDES(po, ppo, obs) + MAPSET(&obsmap, po); + } + for (i = j = 0; i < dqs.count; i++) + if (!MAPTST(&obsmap, dqs.elements[i])) + dqs.elements[j++] = dqs.elements[i]; + dqs.count = j; + for (i = j = 0; i < dq.count; i++) + if (!MAPTST(&obsmap, dq.elements[i])) + dq.elements[j++] = dq.elements[i]; + dq.count = j; + map_free(&obsmap); + } + /* filter out all already supplemented packages if requested */ if (solv->ignorealreadyrecommended && dqs.count) { -- 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] r11933 - in /trunk/zypper: VERSION.cmake package/zypper.changes
by jkupec＠svn.opensuse.org 16 Dec '08

16 Dec '08

Author: jkupec Date: Tue Dec 16 18:24:12 2008 New Revision: 11933 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11933&view=rev Log: - release Modified: trunk/zypper/VERSION.cmake trunk/zypper/package/zypper.changes Modified: trunk/zypper/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/VERSION.cmake?rev=11933&r… ============================================================================== --- trunk/zypper/VERSION.cmake (original) +++ trunk/zypper/VERSION.cmake Tue Dec 16 18:24:12 2008 @@ -31,7 +31,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "0") -SET(VERSION_PATCH "2") +SET(VERSION_PATCH "3") -# LAST RELEASED: 1.0.2 +# LAST RELEASED: 1.0.3 #======= 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 Tue Dec 16 18:24:12 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Dec 16 18:23:32 CET 2008 - jkupec(a)suse.cz + +- translations update +- 1.0.3 + +------------------------------------------------------------------- Thu Dec 11 11:20:42 CET 2008 - jkupec(a)suse.cz - fixed typo (bnc #458248) -- 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] r11932 - /trunk/zypper/po/de.po
by jkupec＠svn.opensuse.org 16 Dec '08

16 Dec '08

Author: jkupec Date: Tue Dec 16 18:23:16 2008 New Revision: 11932 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11932&view=rev Log: - translations Modified: trunk/zypper/po/de.po Modified: trunk/zypper/po/de.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/de.po?rev=11932&r1=119… ============================================================================== --- trunk/zypper/po/de.po (original) +++ trunk/zypper/po/de.po Tue Dec 16 18:23:16 2008 @@ -14,7 +14,7 @@ "Project-Id-Version: zypper.de\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-12-11 11:15+0100\n" -"PO-Revision-Date: Sat Nov 22 14:15:55 UTC 2008\n" +"PO-Revision-Date: Tue Dec 16 09:13:55 UTC 2008\n" "Last-Translator: Marko Schugardt <mail.sapex(a)gmx.de>\n" "Language-Team: German <opensuse-translation-de(a)opensuse.org>\n" "MIME-Version: 1.0\n" @@ -2555,7 +2555,7 @@ #. translators: this option belongs to 'install' command #: ../src/Zypper.cc:906 msgid " --from <alias|#|URI> Select packages only from specified repository.\n" -msgstr "" +msgstr " --from <Alias|#|URI> Nur Pakete aus den festgelegten Repositories wÃ¤hlen.\n" #. TranslatorExplanation the first %s = "package, patch, pattern, product" #. and the second %s = "package" @@ -3739,7 +3739,7 @@ #. 'zypper in --entire-catalog foorepo someargument' is specified #: ../src/Zypper.cc:3002 msgid "Ignoring arguments, marking the entire repository." -msgstr "" +msgstr "Argumente werden ignoriert, markiere das gesamte Repository." #: ../src/Zypper.cc:3012 #, c-format -- 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] r11931 - /trunk/zypper/doc/zypper.8
by jkupec＠svn.opensuse.org 16 Dec '08

16 Dec '08

Author: jkupec Date: Tue Dec 16 18:19:03 2008 New Revision: 11931 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11931&view=rev Log: - some improvements Modified: trunk/zypper/doc/zypper.8 Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=11931&r1… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Tue Dec 16 18:19:03 2008 @@ -68,7 +68,8 @@ server according to some URI parameters or user name, or can be static. Once such service is added to your system, zypper takes care of adding, modifying, or removing these repositories on your system to reflect the current list. -See section Service Management for more details. +See section Service Management and http://en.opensuse.org/Standards/Repository_Index_Service +for more details. .SS Package Types .LP @@ -77,17 +78,20 @@ A resolvable is a package, patch, pattern, or a product. .LP .B package -\- an ordinary RPM package +\- an ordinary RPM package. .br .B patch \- update of one or more packages. A patch can include special scripts and messages to be run or shown during installation of the update. .br .B pattern -\- group of packages required or recommended to install some functionality +\- group of packages required or recommended to install some functionality. .br .B product -\- group of packages which are necessary to install a product +\- group of packages which are necessary to install a product. +.br +.B srcpackage +\- source code package (.src.rpm). This type work only in \fBsearch\fR command currently. .LP Throughout this manual we will refer to resolvables simply as \fIpackages\fR and to resolvable types as \fIpackage types\fR. These type names can be used @@ -476,7 +480,7 @@ List all packages for which newer versions are available, regardles whether they are installable or not. .TP -.I \-\-best\-effort +.I \ \ \ \ \-\-best\-effort See the \fBupdate\fR command for description. @@ -504,7 +508,7 @@ Work only with the repository specified by the alias, number or URI. This option can be used multiple times. .TP -.I \-\-skip\-interactive +.I \ \ \ \ \-\-skip\-interactive This will skip interactive patches, that is, those that need reboot, contain a message, or update a package whose license needs to be confirmed. @@ -534,7 +538,7 @@ Test the update, do not actually install or update any package. This option will add the \-\-test option to the rpm commands run by the update command. .TP -.I \-\-best\-effort +.I \ \ \ \ \-\-best\-effort Do a 'best effort' approach to update. This method does not explicitly select packages with best version and architecture, but instead requests installation of a package with higher version than the installed one and leaves the rest @@ -584,13 +588,13 @@ Work only with the repository specified by the alias, number or URI. This option can be used multiple times. .TP -.I \-\-skip\-interactive +.I \ \ \ \ \-\-skip\-interactive Skip interactive patches. .TP .I \-l, \-\-auto\-agree\-with\-licenses See the \fBupdate\fR command for description of this option. .TP -.I \-\-debug\-solver +.I \ \ \ \ \-\-debug\-solver Create test case for debugging of dependency resolver. .TP .I \-D, \-\-dry\-run @@ -988,6 +992,9 @@ .TP .I \-D, \-\-download\-only Only download the raw metadata, don't parse it or build the database. +.TP +.I \-s, \-\-services +Refresh also services before refreshing repositories. .TP .B clean [options] [alias|#|URI] ... -- 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] r11929 - in /trunk/libzypp/zypp: base/Exception.cc base/Exception.h media/MediaAria2c.cc media/MediaCurl.cc repo/PackageProvider.cc target/TargetCallbackReceiver.cc target/rpm/RpmDb.cc
by mlandres＠svn.opensuse.org 12 Dec '08

12 Dec '08

Author: mlandres Date: Fri Dec 12 13:17:46 2008 New Revision: 11929 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11929&view=rev Log: - Add Exception::asUserHistory: Returns a single (multiline) string composed of asUserString and historyAsString. And use it in reports. Modified: trunk/libzypp/zypp/base/Exception.cc trunk/libzypp/zypp/base/Exception.h trunk/libzypp/zypp/media/MediaAria2c.cc trunk/libzypp/zypp/media/MediaCurl.cc trunk/libzypp/zypp/repo/PackageProvider.cc trunk/libzypp/zypp/target/TargetCallbackReceiver.cc trunk/libzypp/zypp/target/rpm/RpmDb.cc Modified: trunk/libzypp/zypp/base/Exception.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/Exception.cc?r… ============================================================================== --- trunk/libzypp/zypp/base/Exception.cc (original) +++ trunk/libzypp/zypp/base/Exception.cc Fri Dec 12 13:17:46 2008 @@ -68,6 +68,20 @@ return _(str.str().c_str()); } + std::string Exception::asUserHistory() const + { + if ( historyEmpty() ) + return asUserString(); + + std::string ret( asUserString() ); + if ( ret.empty() ) + return historyAsString(); + + ret += '\n'; + ret += historyAsString(); + return ret; + } + void Exception::remember( const Exception & old_r ) { if ( &old_r != this ) // no self-remember Modified: trunk/libzypp/zypp/base/Exception.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/Exception.h?re… ============================================================================== --- trunk/libzypp/zypp/base/Exception.h (original) +++ trunk/libzypp/zypp/base/Exception.h Fri Dec 12 13:17:46 2008 @@ -181,7 +181,9 @@ /** Error message provided by \ref dumpOn as string. */ std::string asString() const; - /** Translated error message as string suitable for the user. */ + /** Translated error message as string suitable for the user. + * \see \ref asUserStringHistory + */ std::string asUserString() const; public: @@ -227,6 +229,8 @@ */ std::string historyAsString() const; + /** A single (multiline) string composed of \ref asUserString and \ref historyAsString. */ + std::string asUserHistory() const; //@} protected: 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 Fri Dec 12 13:17:46 2008 @@ -48,9 +48,9 @@ using namespace std; using namespace zypp::base; -namespace zypp +namespace zypp { -namespace media +namespace media { Pathname MediaAria2c::_cookieFile = "/var/lib/YaST2/cookies"; @@ -70,7 +70,7 @@ }; ExternalProgram aria(argv, ExternalProgram::Stderr_To_Stdout); - + std::string ariaResponse( aria.receiveLine()); string::size_type pos = ariaResponse.find('/', 0 ); if( pos != string::npos ) @@ -138,7 +138,7 @@ true ) // does_download { MIL << "MediaAria2c::MediaAria2c(" << url_r << ", " << attach_point_hint_r << ")" << endl; - + if( !attachPoint().empty()) { PathInfo ainfo(attachPoint()); @@ -169,7 +169,7 @@ void MediaAria2c::attachTo (bool next) { // clear last arguments - _args.clear(); + _args.clear(); if ( next ) ZYPP_THROW(MediaNotSupportedException(_url)); @@ -187,7 +187,7 @@ setAttachPoint( mountpoint, true); } - disconnectFrom(); + disconnectFrom(); // Build the aria command. _args.push_back(_aria2cPath.asString()); @@ -195,12 +195,12 @@ _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", distributionFlavorHeader() )); // TODO add debug option - + // Transfer timeout { _xfer_timeout = TRANSFER_TIMEOUT; @@ -231,11 +231,11 @@ DBG << "Anonymous FTP identification: '" << id << "'" << endl; _userpwd = "anonymous:" + id; } - } - else + } + else { if ( _url.getScheme() == "ftp" ) - { + { _args.push_back(str::form("--ftp-user=%s", _url.getUsername().c_str() )); } else if ( _url.getScheme() == "http" || @@ -243,11 +243,11 @@ { _args.push_back(str::form("--http-user=%s", _url.getUsername().c_str() )); } - + if ( _url.getPassword().size() ) { if ( _url.getScheme() == "ftp" ) - { + { _args.push_back(str::form("--ftp-passwd=%s", _url.getPassword().c_str() )); } else if ( _url.getScheme() == "http" || @@ -260,7 +260,7 @@ // note, aria2c does not support setting the auth type with // (basic, digest yet) - + /*---------------------------------------------------------------* CURLOPT_PROXY: host[:port] @@ -343,7 +343,7 @@ if ( ! _proxyuserpwd.empty() ) { _args.push_back(str::form("--http-proxy-user=%s", _proxyuserpwd.c_str() )); - + string proxypassword( _url.getQueryParam( "proxypassword" ) ); if ( ! proxypassword.empty() ) { _args.push_back(str::form("--http-proxy-passwd=%s", proxypassword.c_str() )); @@ -358,7 +358,7 @@ // FIXME: need a derived class to propelly compare url's MediaSourceRef media( new MediaSource(_url.getScheme(), _url.asString())); setMediaSource(media); - + } bool @@ -407,7 +407,7 @@ void MediaAria2c::getFile( const Pathname & filename ) const { // Use absolute file name to prevent access of files outside of the - // hierarchy below the attach point. + // hierarchy below the attach point. getFileCopy(filename, localPath(filename).absolutename()); } @@ -415,28 +415,28 @@ { callback::SendReport<DownloadProgressReport> report; - Url fileurl(getFileUrl(_url, filename)); + Url fileurl(getFileUrl(_url, filename)); bool retry = false; ExternalProgram::Arguments args = _args; args.push_back(str::form("--dir=%s", target.dirname().c_str())); args.push_back(fileurl.asString()); - + do { try - { - report->start(_url, target.asString() ); - - ExternalProgram aria(args, ExternalProgram::Stderr_To_Stdout); - int nLine = 0; + { + report->start(_url, target.asString() ); + + ExternalProgram aria(args, ExternalProgram::Stderr_To_Stdout); + int nLine = 0; //Process response for(std::string ariaResponse( aria.receiveLine()); - ariaResponse.length(); + ariaResponse.length(); ariaResponse = aria.receiveLine()) - { + { //cout << ariaResponse; if (!ariaResponse.substr(0,31).compare("Exception: Authorization failed") ) @@ -448,11 +448,11 @@ if (!ariaResponse.substr(0,29).compare("Exception: Resource not found") ) { ZYPP_THROW(MediaFileNotFoundException(_url, filename)); - } + } if (!ariaResponse.substr(0,9).compare("[#2 SIZE:")) { - - if (!nLine) + + if (!nLine) { size_t left_bound = ariaResponse.find('(',0) + 1; size_t count = ariaResponse.find('%',left_bound) - left_bound; @@ -460,19 +460,19 @@ //progressData.toMax(); report->progress ( std::atoi(ariaResponse.substr(left_bound, count).c_str()), _url, -1, -1 ); nLine = 1; - } + } else { nLine = 0; - } - } + } + } } aria.close(); - + report->finish( _url , zypp::media::DownloadProgressReport::NO_ERROR, ""); retry = false; } - + // retry with proper authentication data catch (MediaUnauthorizedException & ex_r) { @@ -480,7 +480,7 @@ retry = true; else { - report->finish(fileurl, zypp::media::DownloadProgressReport::ACCESS_DENIED, ex_r.asUserString()); + report->finish(fileurl, zypp::media::DownloadProgressReport::ACCESS_DENIED, ex_r.asUserHistory()); ZYPP_RETHROW(ex_r); } @@ -489,7 +489,7 @@ catch (MediaException & excpt_r) { // FIXME: error number fix - report->finish(fileurl, zypp::media::DownloadProgressReport::ERROR, excpt_r.asUserString()); + report->finish(fileurl, zypp::media::DownloadProgressReport::ERROR, excpt_r.asUserHistory()); ZYPP_RETHROW(excpt_r); } } @@ -530,7 +530,7 @@ bool MediaAria2c::doGetDoesFileExist( const Pathname & filename ) const { - + DBG << filename.asString() << endl; return true; } @@ -584,7 +584,7 @@ getDirectoryYast( retlist, dirname, dots ); } -std::string MediaAria2c::getAria2cVersion() +std::string MediaAria2c::getAria2cVersion() { const char* argv[] = { @@ -605,7 +605,7 @@ Pathname MediaAria2c::whereisAria2c() { Pathname aria2cPathr(ARIA_DEFAULT_BINARY); - + const char* argv[] = { "whereis", @@ -615,23 +615,23 @@ }; ExternalProgram aria(argv, ExternalProgram::Stderr_To_Stdout); - + std::string ariaResponse( aria.receiveLine()); aria.close(); - + string::size_type pos = ariaResponse.find('/', 0 ); - if( pos != string::npos ) + if( pos != string::npos ) { aria2cPathr = ariaResponse; string::size_type pose = ariaResponse.find(' ', pos + 1 ); aria2cPathr = ariaResponse.substr( pos , pose - pos ); MIL << "We will use aria2c located here: " << ariaResponse.substr( pos , pose - pos) << endl; } - else + else { MIL << "We don't know were is ari2ac binary. We will use aria2c located here: " << aria2cPathr << endl; } - + return aria2cPathr; } Modified: trunk/libzypp/zypp/media/MediaCurl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCurl.cc?… ============================================================================== --- trunk/libzypp/zypp/media/MediaCurl.cc (original) +++ trunk/libzypp/zypp/media/MediaCurl.cc Fri Dec 12 13:17:46 2008 @@ -846,7 +846,7 @@ retry = true; else { - report->finish(fileurl, zypp::media::DownloadProgressReport::ACCESS_DENIED, ex_r.asUserString()); + report->finish(fileurl, zypp::media::DownloadProgressReport::ACCESS_DENIED, ex_r.asUserHistory()); ZYPP_RETHROW(ex_r); } } @@ -854,7 +854,7 @@ catch (MediaException & excpt_r) { // FIXME: error number fix - report->finish(fileurl, zypp::media::DownloadProgressReport::ERROR, excpt_r.asUserString()); + report->finish(fileurl, zypp::media::DownloadProgressReport::ERROR, excpt_r.asUserHistory()); ZYPP_RETHROW(excpt_r); } } Modified: trunk/libzypp/zypp/repo/PackageProvider.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/PackageProvide… ============================================================================== --- trunk/libzypp/zypp/repo/PackageProvider.cc (original) +++ trunk/libzypp/zypp/repo/PackageProvider.cc Fri Dec 12 13:17:46 2008 @@ -122,7 +122,7 @@ // TranslatorExplanation %s = name of the package being processed. std::string detail_str( str::form(_("Failed to provide Package %s. Do you want to retry retrieval?"), package_str.c_str() ) ); - detail_str += str::form( "\n\n%s\n%s", excpt.asUserString().c_str(), excpt.historyAsString().c_str() ); + detail_str += str::form( "\n\n%s", excpt.asUserHistory().c_str() ); switch ( report()->problem( _package, repo::DownloadResolvableReport::IO, detail_str.c_str() ) ) { @@ -214,7 +214,7 @@ } catch ( const Exception & excpt ) { - report()->problemDeltaDownload( excpt.asUserString() ); + report()->problemDeltaDownload( excpt.asUserHistory() ); return ManagedFile(); } report()->finishDeltaDownload(); Modified: trunk/libzypp/zypp/target/TargetCallbackReceiver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetCallba… ============================================================================== --- trunk/libzypp/zypp/target/TargetCallbackReceiver.cc (original) +++ trunk/libzypp/zypp/target/TargetCallbackReceiver.cc Fri Dec 12 13:17:46 2008 @@ -32,17 +32,17 @@ RpmInstallPackageReceiver::~RpmInstallPackageReceiver () { } - - void RpmInstallPackageReceiver::reportbegin() + + void RpmInstallPackageReceiver::reportbegin() { } - - void RpmInstallPackageReceiver::reportend() + + void RpmInstallPackageReceiver::reportend() { } /** Start the operation */ - void RpmInstallPackageReceiver::start( const Pathname & name ) + void RpmInstallPackageReceiver::start( const Pathname & name ) { _report->start( _resolvable ); _abort = false; @@ -57,26 +57,26 @@ _abort = ! _report->progress( percent, _resolvable ); return _abort; } - - rpm::RpmInstallReport::Action + + rpm::RpmInstallReport::Action RpmInstallPackageReceiver::problem( Exception & excpt_r ) { - rpm::InstallResolvableReport::Action user = + rpm::InstallResolvableReport::Action user = _report->problem( _resolvable , rpm::InstallResolvableReport::INVALID - , excpt_r.asUserString() + , excpt_r.asUserHistory() , _level ); - + switch (user) { - case rpm::InstallResolvableReport::RETRY: + case rpm::InstallResolvableReport::RETRY: return rpm::RpmInstallReport::RETRY; - case rpm::InstallResolvableReport::ABORT: + case rpm::InstallResolvableReport::ABORT: return rpm::RpmInstallReport::ABORT; - case rpm::InstallResolvableReport::IGNORE: + case rpm::InstallResolvableReport::IGNORE: return rpm::RpmInstallReport::IGNORE; } - + return rpm::RpmInstallReport::problem( excpt_r ); } @@ -91,7 +91,7 @@ { _report->finish( _resolvable, rpm::InstallResolvableReport::INVALID, std::string(), _level ); } - + void RpmInstallPackageReceiver::tryLevel( target::rpm::InstallResolvableReport::RpmLevel level_r ) { _level = level_r; @@ -112,17 +112,17 @@ RpmRemovePackageReceiver::~RpmRemovePackageReceiver () { } - - void RpmRemovePackageReceiver::reportbegin() + + void RpmRemovePackageReceiver::reportbegin() { } - - void RpmRemovePackageReceiver::reportend() + + void RpmRemovePackageReceiver::reportend() { } /** Start the operation */ - void RpmRemovePackageReceiver::start( const std::string & name ) + void RpmRemovePackageReceiver::start( const std::string & name ) { _report->start( _resolvable ); } @@ -136,25 +136,25 @@ _abort = ! _report->progress( percent, _resolvable ); return _abort; } - - rpm::RpmRemoveReport::Action + + rpm::RpmRemoveReport::Action RpmRemovePackageReceiver::problem( Exception & excpt_r ) { - rpm::RemoveResolvableReport::Action user = + rpm::RemoveResolvableReport::Action user = _report->problem( _resolvable , rpm::RemoveResolvableReport::INVALID - , excpt_r.asUserString() + , excpt_r.asUserHistory() ); - + switch (user) { - case rpm::RemoveResolvableReport::RETRY: + case rpm::RemoveResolvableReport::RETRY: return rpm::RpmRemoveReport::RETRY; - case rpm::RemoveResolvableReport::ABORT: + case rpm::RemoveResolvableReport::ABORT: return rpm::RpmRemoveReport::ABORT; - case rpm::RemoveResolvableReport::IGNORE: + case rpm::RemoveResolvableReport::IGNORE: return rpm::RpmRemoveReport::IGNORE; } - + return rpm::RpmRemoveReport::problem( excpt_r ); } Modified: trunk/libzypp/zypp/target/rpm/RpmDb.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/rpm/RpmDb.cc… ============================================================================== --- trunk/libzypp/zypp/target/rpm/RpmDb.cc (original) +++ trunk/libzypp/zypp/target/rpm/RpmDb.cc Fri Dec 12 13:17:46 2008 @@ -828,7 +828,7 @@ } catch (RpmException & excpt_r) { - report->finish(root() + dbPath(), RebuildDBReport::FAILED, excpt_r.asUserString()); + report->finish(root() + dbPath(), RebuildDBReport::FAILED, excpt_r.asUserHistory()); ZYPP_RETHROW(excpt_r); } report->finish(root() + dbPath(), RebuildDBReport::NO_ERROR, ""); @@ -1238,7 +1238,7 @@ } catch (RpmException & excpt_r) { - report->finish(ScanDBReport::FAILED, excpt_r.asUserString ()); + report->finish(ScanDBReport::FAILED, excpt_r.asUserHistory ()); ZYPP_RETHROW(excpt_r); } #warning fixme -- 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] r11928 - in /trunk/dialogsolver: CMakeLists.txt yast_plugin/CMakeLists.txt
by mlandres＠svn.opensuse.org 12 Dec '08

12 Dec '08

Author: mlandres Date: Fri Dec 12 10:55:24 2008 New Revision: 11928 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11928&view=rev Log: use FIND_PACKAGE to locate Libyui Modified: trunk/dialogsolver/CMakeLists.txt trunk/dialogsolver/yast_plugin/CMakeLists.txt Modified: trunk/dialogsolver/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/CMakeLists.txt?rev=… ============================================================================== --- trunk/dialogsolver/CMakeLists.txt (original) +++ trunk/dialogsolver/CMakeLists.txt Fri Dec 12 10:55:24 2008 @@ -16,6 +16,7 @@ FIND_PACKAGE(Qt4 REQUIRED) FIND_PACKAGE(Zypp REQUIRED) +FIND_PACKAGE(Libyui REQUIRED) FIND_PACKAGE(Gettext REQUIRED) IF (GETTEXT_FOUND) MESSAGE(STATUS "Found Gettext: ${GETTEXT_SOURCE}") Modified: trunk/dialogsolver/yast_plugin/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/yast_plugin/CMakeLi… ============================================================================== --- trunk/dialogsolver/yast_plugin/CMakeLists.txt (original) +++ trunk/dialogsolver/yast_plugin/CMakeLists.txt Fri Dec 12 10:55:24 2008 @@ -27,10 +27,9 @@ QT4_AUTOMOC(${qt_solver_dialog_plugin_SRCS}) INCLUDE_DIRECTORIES( ${QT_INCLUDES} ) -INCLUDE_DIRECTORIES( ${CMAKE_INSTALL_PREFIX}/include/YaST2/yui ) +INCLUDE_DIRECTORIES( ${LIBYUI_INCLUDE_DIR} ) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) -INCLUDE_DIRECTORIES( ${CMAKE_INSTALL_PREFIX}/include/YaST2/yast2-qt ) INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} ) INCLUDE_DIRECTORIES( ../src ) -- 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] r11927 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes tests/zypp/base/String_test.cc zypp/base/String.cc zypp/base/String.h zypp/sat/detail/PoolImpl.cc
by mlandres＠svn.opensuse.org 11 Dec '08

11 Dec '08

Author: mlandres Date: Thu Dec 11 21:44:47 2008 New Revision: 11927 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11927&view=rev Log: - Add str::hexencode and str::hexdecode to encode special characters in a string as %XX. - Hexdecode modalias strings in rpm dependencies because rpm does not allow comma, blank and other special chars. (bnc #456695) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/tests/zypp/base/String_test.cc trunk/libzypp/zypp/base/String.cc trunk/libzypp/zypp/base/String.h trunk/libzypp/zypp/sat/detail/PoolImpl.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11927&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Thu Dec 11 21:44:47 2008 @@ -60,8 +60,8 @@ # SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") -SET(LIBZYPP_MINOR "24") -SET(LIBZYPP_PATCH "8") +SET(LIBZYPP_MINOR "25") +SET(LIBZYPP_PATCH "0") # # LAST RELEASED: 5.24.7 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Dec 11 21:44:47 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Thu Dec 11 21:39:50 CET 2008 - ma(a)suse.de + +- Add str::hexencode and str::hexdecode to encode special characters + in a string as %XX. +- Hexdecode modalias strings in rpm dependencies because rpm does not + allow comma, blank and other special chars. (bnc #456695) +- revision 11927 + +------------------------------------------------------------------- Thu Dec 11 17:13:06 CET 2008 - ma(a)suse.de - Catch and report media errors when proving packages. (bnc #457652) Modified: trunk/libzypp/tests/zypp/base/String_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/base/String_t… ============================================================================== --- trunk/libzypp/tests/zypp/base/String_test.cc (original) +++ trunk/libzypp/tests/zypp/base/String_test.cc Thu Dec 11 21:44:47 2008 @@ -225,3 +225,28 @@ BOOST_CHECK( ! str::contains("abcXabcYabc", "xabcy") ); BOOST_CHECK( str::containsCI("abcXabcYabc", "xabcy") ); } + +BOOST_AUTO_TEST_CASE(hexencode_hexdecode) +{ + std::string o; + o.reserve( 256 ); + for ( unsigned i = 1; i < 256; ++i ) + o += i; + + std::string e( str::hexencode( o ) ); + // encoded contains nothing but [%a-zA-Z0-9] + for ( unsigned i = 0; i < 255; ++i ) + { + char ch = e[i]; + BOOST_CHECK( ch == '%' + || ( 'a' <= ch && ch <= 'z' ) + || ( 'A' <= ch && ch <= 'Z' ) + || ( '0' <= ch && ch <= '9' ) ); + } + + std::string d( str::hexdecode( e ) ); + BOOST_CHECK( o == d ); +// for ( unsigned i = 0; i < 255; ++i ) +// if ( o[i] != d[i] ) +// WAR << i << " " << unsigned(o[i]) << " != " << unsigned(d[i]) << endl; +} Modified: trunk/libzypp/zypp/base/String.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/String.cc?rev=… ============================================================================== --- trunk/libzypp/zypp/base/String.cc (original) +++ trunk/libzypp/zypp/base/String.cc Thu Dec 11 21:44:47 2008 @@ -83,6 +83,78 @@ ); } + /////////////////////////////////////////////////////////////////// + // Hexencode + /////////////////////////////////////////////////////////////////// + namespace { + /** What's not decoded. */ + inline bool heIsAlNum( char ch ) + { + return ( ( 'a' <= ch && ch <= 'z' ) + ||( 'A' <= ch && ch <= 'Z' ) + ||( '0' <= ch && ch <= '9' ) ); + } + /** Hex-digit to number or -1. */ + inline int heDecodeCh( char ch ) + { + if ( '0' <= ch && ch <= '9' ) + return( ch - '0' ); + if ( 'A' <= ch && ch <= 'Z' ) + return( ch - 'A' + 10 ); + if ( 'a' <= ch && ch <= 'z' ) + return( ch - 'A' + 10 ); + return -1; + } + } + + std::string hexencode( const C_Str & str_r ) + { + static const char *const hdig = "0123456789ABCDEF"; + std::string res; + res.reserve( str_r.size() ); + for ( const char * it = str_r.c_str(); *it; ++it ) + { + if ( heIsAlNum( *it ) ) + { + res += *it; + } + else + { + res += '%'; + res += hdig[(unsigned char)(*it)/16]; + res += hdig[(unsigned char)(*it)%16]; + } + } + return res; + } + + std::string hexdecode( const C_Str & str_r ) + { + std::string res; + res.reserve( str_r.size() ); + for_( it, str_r.c_str(), str_r.c_str()+str_r.size() ) + { + if ( *it == '%' ) + { + int d1 = heDecodeCh( *(it+1) ); + if ( d1 != -1 ) + { + int d2 = heDecodeCh( *(it+2) ); + if ( d2 != -1 ) + { + res += (d1<<4)|d2; + it += 2; + continue; + } + } + } + // verbatim if no %XX: + res += *it; + } + return res; + } + /////////////////////////////////////////////////////////////////// + /****************************************************************** ** ** FUNCTION NAME : toLower @@ -285,6 +357,7 @@ } + /****************************************************************** ** ** Modified: trunk/libzypp/zypp/base/String.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/String.h?rev=1… ============================================================================== --- trunk/libzypp/zypp/base/String.h (original) +++ trunk/libzypp/zypp/base/String.h Thu Dec 11 21:44:47 2008 @@ -584,6 +584,11 @@ * * For use when printing \a c separated values, and where * \ref joinEscaped() is too heavy. + * + * \todo use C_Str instead of std::string to prevent unnecessary + * promotion to string if used with "string". + * + * \todo shoud not be documented in doxy-group 'Join' */ std::string escape(const std::string & str_r, const char c = ' ' ); @@ -591,6 +596,20 @@ //@} /////////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + /** \name Hexencode. + * Encode all characters other than [a-zA-Z0-9] as %XX. + * This includes the % character itself, which becomes %25. + */ + //@{ + /** Encode all characters other than [a-zA-Z0-9] as %XX. + * This includes the % character itself, which becomes %25. + */ + std::string hexencode( const C_Str & str_r ); + /** Decode hexencoded %XX sequences. */ + std::string hexdecode( const C_Str & str_r ); + //@} + /////////////////////////////////////////////////////////////////// /** \name Case conversion. */ //@{ Modified: trunk/libzypp/zypp/sat/detail/PoolImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/detail/PoolImpl… ============================================================================== --- trunk/libzypp/zypp/sat/detail/PoolImpl.cc (original) +++ trunk/libzypp/zypp/sat/detail/PoolImpl.cc Thu Dec 11 21:44:47 2008 @@ -107,7 +107,11 @@ case NAMESPACE_MODALIAS: { - return target::Modalias::instance().query( IdString(rhs) ) ? RET_systemProperty : RET_unsupported; + // modalias strings in capability may be hexencoded because rpm does not allow + // ',', ' ' or other special chars. + return target::Modalias::instance().query( str::hexdecode( IdString(rhs).c_str() ) ) + ? RET_systemProperty + : RET_unsupported; } break; -- 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] r11926 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes zypp/repo/PackageProvider.cc
by mlandres＠svn.opensuse.org 11 Dec '08

11 Dec '08

Author: mlandres Date: Thu Dec 11 17:16:23 2008 New Revision: 11926 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11926&view=rev Log: - Catch and report media errors when proving packages. (bnc #457652) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/repo/PackageProvider.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11926&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Thu Dec 11 17:16:23 2008 @@ -61,7 +61,7 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") SET(LIBZYPP_MINOR "24") -SET(LIBZYPP_PATCH "7") +SET(LIBZYPP_PATCH "8") # # LAST RELEASED: 5.24.7 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Dec 11 17:16:23 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Dec 11 17:13:06 CET 2008 - ma(a)suse.de + +- Catch and report media errors when proving packages. (bnc #457652) +- revision 11926 + +------------------------------------------------------------------- Wed Dec 10 16:09:08 CET 2008 - ma(a)suse.de - Remove obsolete zypp.conf::productsdir and deprecate Modified: trunk/libzypp/zypp/repo/PackageProvider.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/PackageProvide… ============================================================================== --- trunk/libzypp/zypp/repo/PackageProvider.cc (original) +++ trunk/libzypp/zypp/repo/PackageProvider.cc Thu Dec 11 17:16:23 2008 @@ -103,14 +103,44 @@ { ret = doProvidePackage(); } - catch ( const Exception & excpt ) + catch ( const UserRequestException & excpt ) { + // UserRequestException e.g. from failOnChecksumError was already reported. ERR << "Failed to provide Package " << _package << endl; if ( ! _retry ) { ZYPP_RETHROW( excpt ); } } + catch ( const Exception & excpt ) + { + ERR << "Failed to provide Package " << _package << endl; + if ( ! _retry ) + { + // Aything else gets reported + std::string package_str = _package->name() + "-" + _package->edition().asString(); + + // TranslatorExplanation %s = name of the package being processed. + std::string detail_str( str::form(_("Failed to provide Package %s. Do you want to retry retrieval?"), package_str.c_str() ) ); + detail_str += str::form( "\n\n%s\n%s", excpt.asUserString().c_str(), excpt.historyAsString().c_str() ); + + switch ( report()->problem( _package, repo::DownloadResolvableReport::IO, detail_str.c_str() ) ) + { + case repo::DownloadResolvableReport::RETRY: + _retry = true; + break; + case repo::DownloadResolvableReport::IGNORE: + ZYPP_THROW(SkipRequestException("User requested skip of corrupted file")); + break; + case repo::DownloadResolvableReport::ABORT: + ZYPP_THROW(AbortRequestException("User requested to abort")); + break; + default: + ZYPP_RETHROW( excpt ); + break; + } + } + } } while ( _retry ); report()->finish( _package, repo::DownloadResolvableReport::NO_ERROR, std::string() ); -- 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] r11925 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 11 Dec '08

11 Dec '08

Author: jkupec Date: Thu Dec 11 11:20:03 2008 New Revision: 11925 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11925&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 Thu Dec 11 11:20:03 2008 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Thu Dec 11 11:20:42 CET 2008 - jkupec(a)suse.cz + +- fixed typo (bnc #458248) +- r11924 + +------------------------------------------------------------------- +Fri Dec 5 14:55:00 CET 2008 - jkupec(a)suse.cz + +- man page update (fixes also bnc #450857) + +------------------------------------------------------------------- Mon Dec 1 16:53:29 CET 2008 - jkupec(a)suse.cz - fixed handling of source-install -d and -D options (bnc #428131) -- 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] r11924 - /trunk/zypper/src/Zypper.cc
by jkupec＠svn.opensuse.org 11 Dec '08

11 Dec '08

Author: jkupec Date: Thu Dec 11 11:11:41 2008 New Revision: 11924 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11924&view=rev Log: - typo (bnc #458248) 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=11924&r… ============================================================================== --- trunk/zypper/src/Zypper.cc (original) +++ trunk/zypper/src/Zypper.cc Thu Dec 11 11:11:41 2008 @@ -2999,7 +2999,7 @@ if (!_arguments.empty()) // translators: rug related message, shown if // 'zypper in --entire-catalog foorepo someargument' is specified - out().warning(_("Ingoring arguments, marking the entire repository.")); + out().warning(_("Ignoring arguments, marking the entire repository.")); _arguments.clear(); _arguments.push_back("*"); _copts["from"] = _copts["entire-catalog"]; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0