Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2013-01-20 08:04:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2012-12-21 10:22:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2013-01-20 08:04:35.000000000 +0100 @@ -1,0 +2,22 @@ +Fri Jan 18 14:07:50 CET 2013 - [email protected] + +- Reduce logging +- MediaMultiCurl: throw AbortRequestException if aborted by user +- version 12.7.0 (0) + +------------------------------------------------------------------- +Sun Jan 13 01:13:23 CET 2013 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Sun Jan 6 01:13:17 CET 2013 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Dec 27 01:13:27 CET 2012 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- libzypp-12.6.0.tar.bz2 New: ---- libzypp-12.7.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.7GRmlL/_old 2013-01-20 08:04:39.000000000 +0100 +++ /var/tmp/diff_new_pack.7GRmlL/_new 2013-01-20 08:04:39.000000000 +0100 @@ -24,7 +24,7 @@ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management -Version: 12.6.0 +Version: 12.7.0 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ libzypp-12.6.0.tar.bz2 -> libzypp-12.7.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.6.0/VERSION.cmake new/libzypp-12.7.0/VERSION.cmake --- old/libzypp-12.6.0/VERSION.cmake 2012-12-18 15:58:29.000000000 +0100 +++ new/libzypp-12.7.0/VERSION.cmake 2013-01-18 21:22:25.000000000 +0100 @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "12") SET(LIBZYPP_COMPATMINOR "0") -SET(LIBZYPP_MINOR "6") +SET(LIBZYPP_MINOR "7") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 12.6.0 (0) +# LAST RELEASED: 12.7.0 (0) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.6.0/package/libzypp.changes new/libzypp-12.7.0/package/libzypp.changes --- old/libzypp-12.6.0/package/libzypp.changes 2012-12-18 15:58:29.000000000 +0100 +++ new/libzypp-12.7.0/package/libzypp.changes 2013-01-18 21:22:25.000000000 +0100 @@ -1,4 +1,26 @@ ------------------------------------------------------------------- +Fri Jan 18 14:07:50 CET 2013 - [email protected] + +- Reduce logging +- MediaMultiCurl: throw AbortRequestException if aborted by user +- version 12.7.0 (0) + +------------------------------------------------------------------- +Sun Jan 13 01:13:23 CET 2013 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Sun Jan 6 01:13:17 CET 2013 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Dec 27 01:13:27 CET 2012 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Mon Dec 17 13:31:15 CET 2012 - [email protected] - Add NamedValue<_Tp>: Simple value<>name mapping supporting aliases Files old/libzypp-12.6.0/po/zypp-po.tar.bz2 and new/libzypp-12.7.0/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.6.0/zypp/PathInfo.cc new/libzypp-12.7.0/zypp/PathInfo.cc --- old/libzypp-12.6.0/zypp/PathInfo.cc 2012-12-18 15:58:29.000000000 +0100 +++ new/libzypp-12.7.0/zypp/PathInfo.cc 2013-01-18 21:22:25.000000000 +0100 @@ -22,6 +22,7 @@ #include "zypp/base/String.h" #include "zypp/base/IOStream.h" #include "zypp/base/StrMatcher.h" +#include "zypp/base/Errno.h" #include "zypp/AutoDispose.h" #include "zypp/ExternalProgram.h" @@ -264,17 +265,15 @@ str << obj.asString() << "{"; if ( !obj.isExist() ) { - str << "does not exist}"; + str << Errno( obj.error() ); } else { str << obj.asStatMode() << " " << std::dec << obj.owner() << "/" << obj.group(); if ( obj.isFile() ) str << " size " << obj.size(); - - str << "}"; } - return str; + return str << "}"; } /////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.6.0/zypp/base/String.h new/libzypp-12.7.0/zypp/base/String.h --- old/libzypp-12.6.0/zypp/base/String.h 2012-12-18 15:58:29.000000000 +0100 +++ new/libzypp-12.7.0/zypp/base/String.h 2013-01-18 21:22:25.000000000 +0100 @@ -115,6 +115,9 @@ inline std::string asString( const char * t ) { return t; } + inline std::string asString( char * t ) + { return t; } + template<class _T> inline std::string asString( const _T &t ) { return t.asString(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.6.0/zypp/media/MediaCurl.cc new/libzypp-12.7.0/zypp/media/MediaCurl.cc --- old/libzypp-12.6.0/zypp/media/MediaCurl.cc 2012-12-18 15:58:29.000000000 +0100 +++ new/libzypp-12.7.0/zypp/media/MediaCurl.cc 2013-01-18 21:22:25.000000000 +0100 @@ -728,7 +728,7 @@ it != vol_settings.headersEnd(); ++it ) { - MIL << "HEADER " << *it << std::endl; + // MIL << "HEADER " << *it << std::endl; _customHeaders = curl_slist_append(_customHeaders, it->c_str()); if ( !_customHeaders ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.6.0/zypp/media/MediaMultiCurl.cc new/libzypp-12.7.0/zypp/media/MediaMultiCurl.cc --- old/libzypp-12.6.0/zypp/media/MediaMultiCurl.cc 2012-12-18 15:58:29.000000000 +0100 +++ new/libzypp-12.7.0/zypp/media/MediaMultiCurl.cc 2013-01-18 21:22:25.000000000 +0100 @@ -253,7 +253,7 @@ string line(p + 9, l - 9); if (line[l - 10] == '\r') line.erase(l - 10, 1); - DBG << "#" << _workerno << ": redirecting to" << line << endl; + XXX << "#" << _workerno << ": redirecting to" << line << endl; return size; } if (l <= 14 || l >= 128 || strncasecmp(p, "Content-Range:", 14) != 0) @@ -281,7 +281,7 @@ } if (_request->_filesize != (off_t)filesize) { - DBG << "#" << _workerno << ": filesize mismatch" << endl; + XXX << "#" << _workerno << ": filesize mismatch" << endl; _state = WORKER_BROKEN; strncpy(_curlError, "filesize mismatch", CURL_ERROR_SIZE); } @@ -320,7 +320,7 @@ _urlbuf = curlUrl.asString(); _curl = _request->_context->fromEasyPool(_url.getHost()); if (_curl) - DBG << "reused worker from pool" << endl; + XXX << "reused worker from pool" << endl; if (!_curl && !(_curl = curl_easy_init())) { _state = WORKER_BROKEN; @@ -365,7 +365,7 @@ long auth = CurlAuthData::auth_type_str2long(use_auth); if( auth != CURLAUTH_NONE) { - DBG << "#" << _workerno << ": Enabling HTTP authentication methods: " << use_auth + XXX << "#" << _workerno << ": Enabling HTTP authentication methods: " << use_auth << " (CURLOPT_HTTPAUTH=" << auth << ")" << std::endl; curl_easy_setopt(_curl, CURLOPT_HTTPAUTH, auth); } @@ -454,7 +454,7 @@ return; } - DBG << "checking DNS lookup of " << host << endl; + XXX << "checking DNS lookup of " << host << endl; int pipefds[2]; if (pipe(pipefds)) { @@ -535,7 +535,7 @@ return; } int exitcode = WEXITSTATUS(status); - DBG << "#" << _workerno << ": DNS lookup returned " << exitcode << endl; + XXX << "#" << _workerno << ": DNS lookup returned " << exitcode << endl; if (exitcode != 0) { _state = WORKER_BROKEN; @@ -550,7 +550,7 @@ bool multifetchworker::checkChecksum() { - // DBG << "checkChecksum block " << _blkno << endl; + // XXX << "checkChecksum block " << _blkno << endl; if (!_blksize || !_request->_blklist) return true; return _request->_blklist->verifyDigest(_blkno, _dig); @@ -559,7 +559,7 @@ bool multifetchworker::recheckChecksum() { - // DBG << "recheckChecksum block " << _blkno << endl; + // XXX << "recheckChecksum block " << _blkno << endl; if (!_request->_fp || !_blksize || !_request->_blklist) return true; if (fseeko(_request->_fp, _blkstart, SEEK_SET)) @@ -584,7 +584,7 @@ { if (!_request->_stealing) { - DBG << "start stealing!" << endl; + XXX << "start stealing!" << endl; _request->_stealing = true; } multifetchworker *best = 0; @@ -644,8 +644,8 @@ } // lets see if we should sleep a bit - DBG << "me #" << _workerno << ": " << _avgspeed << ", size " << best->_blksize << endl; - DBG << "best #" << best->_workerno << ": " << best->_avgspeed << ", size " << (best->_blksize - best->_blkreceived) << endl; + XXX << "me #" << _workerno << ": " << _avgspeed << ", size " << best->_blksize << endl; + XXX << "best #" << best->_workerno << ": " << best->_avgspeed << ", size " << (best->_blksize - best->_blkreceived) << endl; if (_avgspeed && best->_avgspeed && best->_blksize - best->_blkreceived > 0 && (best->_blksize - best->_blkreceived) * _avgspeed < best->_blksize * best->_avgspeed) { @@ -654,7 +654,7 @@ double sl = (best->_blksize - best->_blkreceived) / best->_avgspeed * 2; if (sl > 1) sl = 1; - DBG << "#" << _workerno << ": going to sleep for " << sl * 1000 << " ms" << endl; + XXX << "#" << _workerno << ": going to sleep for " << sl * 1000 << " ms" << endl; _sleepuntil = now + sl; _state = WORKER_SLEEP; _request->_sleepworkers++; @@ -751,7 +751,7 @@ sprintf(rangebuf, "%llu-", (unsigned long long)_blkstart); else sprintf(rangebuf, "%llu-%llu", (unsigned long long)_blkstart, (unsigned long long)_blkstart + _blksize - 1); - DBG << "#" << _workerno << ": BLK " << _blkno << ":" << rangebuf << " " << _url << endl; + XXX << "#" << _workerno << ": BLK " << _blkno << ":" << rangebuf << " " << _url << endl; if (curl_easy_setopt(_curl, CURLOPT_RANGE, !_noendrange || _blkstart != 0 ? rangebuf : (char *)0) != CURLE_OK) { _request->_activeworkers--; @@ -846,7 +846,7 @@ if (_finished) { - DBG << "finished!" << endl; + XXX << "finished!" << endl; break; } @@ -971,7 +971,7 @@ continue; if (_minsleepuntil == worker->_sleepuntil) _minsleepuntil = 0; - DBG << "#" << worker->_workerno << ": sleep done, wake up" << endl; + XXX << "#" << worker->_workerno << ": sleep done, wake up" << endl; _sleepworkers--; // nextjob chnages the state worker->nextjob(); @@ -996,20 +996,20 @@ else worker->_avgspeed = worker->_blkreceived / (now - worker->_blkstarttime); } - DBG << "#" << worker->_workerno << ": BLK " << worker->_blkno << " done code " << cc << " speed " << worker->_avgspeed << endl; + XXX << "#" << worker->_workerno << ": BLK " << worker->_blkno << " done code " << cc << " speed " << worker->_avgspeed << endl; curl_multi_remove_handle(_multi, easy); if (cc == CURLE_HTTP_RETURNED_ERROR) { long statuscode = 0; (void)curl_easy_getinfo(easy, CURLINFO_RESPONSE_CODE, &statuscode); - DBG << "HTTP status " << statuscode << endl; + XXX << "HTTP status " << statuscode << endl; if (statuscode == 416 && !_blklist) /* Range error */ { if (_filesize == off_t(-1)) { if (!worker->_noendrange) { - DBG << "#" << worker->_workerno << ": retrying with no end range" << endl; + XXX << "#" << worker->_workerno << ": retrying with no end range" << endl; worker->_noendrange = true; worker->run(); continue; @@ -1045,7 +1045,7 @@ // with something broken. Thus we have to re-check the block. if (!worker->recheckChecksum()) { - DBG << "#" << worker->_workerno << ": recheck checksum error, refetch block" << endl; + XXX << "#" << worker->_workerno << ": recheck checksum error, refetch block" << endl; // re-fetch! No need to worry about the bad workers, // they will now be set to DISCARD. At the end of their block // they will notice that they wrote bad data and go into BROKEN. @@ -1081,7 +1081,7 @@ ratio = ratio * ratio; if (ratio > .01) { - DBG << "#" << worker->_workerno << ": too slow ("<< ratio << ", " << worker->_avgspeed << ", #" << maxworkerno << ": " << maxavg << "), going to sleep for " << ratio * 1000 << " ms" << endl; + XXX << "#" << worker->_workerno << ": too slow ("<< ratio << ", " << worker->_avgspeed << ", #" << maxworkerno << ": " << maxavg << "), going to sleep for " << ratio * 1000 << " ms" << endl; worker->_sleepuntil = now + ratio; worker->_state = WORKER_SLEEP; _sleepworkers++; @@ -1343,29 +1343,29 @@ mlp.parse(Pathname(destNew)); MediaBlockList bl = mlp.getBlockList(); vector<Url> urls = mlp.getUrls(); - DBG << bl << endl; + XXX << bl << endl; file = fopen(destNew.c_str(), "w+e"); if (!file) ZYPP_THROW(MediaWriteException(destNew)); if (PathInfo(target).isExist()) { - DBG << "reusing blocks from file " << target << endl; + XXX << "reusing blocks from file " << target << endl; bl.reuseBlocks(file, target.asString()); - DBG << bl << endl; + XXX << bl << endl; } if (bl.haveChecksum(1) && PathInfo(failedFile).isExist()) { - DBG << "reusing blocks from file " << failedFile << endl; + XXX << "reusing blocks from file " << failedFile << endl; bl.reuseBlocks(file, failedFile.asString()); - DBG << bl << endl; + XXX << bl << endl; filesystem::unlink(failedFile); } Pathname df = deltafile(); if (!df.empty()) { - DBG << "reusing blocks from file " << df << endl; + XXX << "reusing blocks from file " << df << endl; bl.reuseBlocks(file, df.asString()); - DBG << bl << endl; + XXX << bl << endl; } try { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.6.0/zypp/target/rpm/RpmHeader.cc new/libzypp-12.7.0/zypp/target/rpm/RpmHeader.cc --- old/libzypp-12.6.0/zypp/target/rpm/RpmHeader.cc 2012-12-18 15:58:29.000000000 +0100 +++ new/libzypp-12.7.0/zypp/target/rpm/RpmHeader.cc 2013-01-18 21:22:25.000000000 +0100 @@ -285,6 +285,11 @@ return has_tag( RPMTAG_SOURCEPACKAGE ); } +bool RpmHeader::isNosrc() const +{ + return has_tag( RPMTAG_SOURCEPACKAGE ) && ( has_tag( RPMTAG_NOSOURCE ) || has_tag( RPMTAG_NOPATCH ) ); +} + /////////////////////////////////////////////////////////////////// // // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.6.0/zypp/target/rpm/RpmHeader.h new/libzypp-12.7.0/zypp/target/rpm/RpmHeader.h --- old/libzypp-12.6.0/zypp/target/rpm/RpmHeader.h 2012-12-18 15:58:29.000000000 +0100 +++ new/libzypp-12.7.0/zypp/target/rpm/RpmHeader.h 2013-01-18 21:22:25.000000000 +0100 @@ -83,7 +83,8 @@ virtual ~RpmHeader(); - bool isSrc() const; + bool isSrc() const; //< Either 'src' or 'nosrc' + bool isNosrc() const; //< Only 'nosrc' public: -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
