Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2013-04-14 10:35:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-03-22 12:00:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2013-04-14 10:35:10.000000000 +0200 @@ -1,0 +2,24 @@ +Fri Apr 5 14:26:35 CEST 2013 - [email protected] + +- added new fuction zypp::ZYpp::provideSrcPackage +- Treat opensuse-education as separate vendor (bnc#812608) +- AArch64 support +- version 12.11.0 (0) + +------------------------------------------------------------------- +Wed Mar 27 12:31:17 CET 2013 - [email protected] + +- added tftp-support (bnc#803316) +- version 12.10.1 (0) + +------------------------------------------------------------------- +Tue Mar 26 13:06:21 CET 2013 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Mar 21 01:13:45 CET 2013 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- libzypp-12.10.0.tar.bz2 New: ---- libzypp-12.11.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.pNnkw6/_old 2013-04-14 10:35:12.000000000 +0200 +++ /var/tmp/diff_new_pack.pNnkw6/_new 2013-04-14 10:35:12.000000000 +0200 @@ -24,7 +24,7 @@ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management -Version: 12.10.0 +Version: 12.11.0 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ libzypp-12.10.0.tar.bz2 -> libzypp-12.11.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/VERSION.cmake new/libzypp-12.11.0/VERSION.cmake --- old/libzypp-12.10.0/VERSION.cmake 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/VERSION.cmake 2013-04-05 14:29:29.000000000 +0200 @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "12") SET(LIBZYPP_COMPATMINOR "0") -SET(LIBZYPP_MINOR "10") +SET(LIBZYPP_MINOR "11") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 12.10.0 (0) +# LAST RELEASED: 12.11.0 (0) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/package/libzypp.changes new/libzypp-12.11.0/package/libzypp.changes --- old/libzypp-12.10.0/package/libzypp.changes 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/package/libzypp.changes 2013-04-05 14:29:29.000000000 +0200 @@ -1,4 +1,28 @@ ------------------------------------------------------------------- +Fri Apr 5 14:26:35 CEST 2013 - [email protected] + +- added new fuction zypp::ZYpp::provideSrcPackage +- Treat opensuse-education as separate vendor (bnc#812608) +- AArch64 support +- version 12.11.0 (0) + +------------------------------------------------------------------- +Wed Mar 27 12:31:17 CET 2013 - [email protected] + +- added tftp-support (bnc#803316) +- version 12.10.1 (0) + +------------------------------------------------------------------- +Tue Mar 26 13:06:21 CET 2013 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Mar 21 01:13:45 CET 2013 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Sun Mar 10 01:14:01 CET 2013 - [email protected] - Update zypp-po.tar.bz2 Files old/libzypp-12.10.0/po/zypp-po.tar.bz2 and new/libzypp-12.11.0/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/tests/zypp/Vendor_test.cc new/libzypp-12.11.0/tests/zypp/Vendor_test.cc --- old/libzypp-12.10.0/tests/zypp/Vendor_test.cc 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/tests/zypp/Vendor_test.cc 2013-04-05 16:08:34.000000000 +0200 @@ -38,6 +38,9 @@ // but "opensuse build service" gets its own class: BOOST_REQUIRE( !VendorAttr::instance().equivalent("opensuse build service", "suse") ); BOOST_REQUIRE( !VendorAttr::instance().equivalent("opensuse build service", "opensuse") ); - BOOST_REQUIRE( VendorAttr::instance().equivalent("opensuse build service", "opensuse build service 2") ); + // bnc#812608: All opensuse projects get their own class + BOOST_REQUIRE( !VendorAttr::instance().equivalent("opensuse-education", "suse") ); + BOOST_REQUIRE( !VendorAttr::instance().equivalent("opensuse-education", "opensuse") ); + BOOST_REQUIRE( !VendorAttr::instance().equivalent("opensuse-education", "opensuse build service") ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/Arch.cc new/libzypp-12.11.0/zypp/Arch.cc --- old/libzypp-12.10.0/zypp/Arch.cc 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/Arch.cc 2013-03-28 13:01:31.000000000 +0100 @@ -187,6 +187,7 @@ DEF_BUILTIN( sparcv8 ); DEF_BUILTIN( sparc ); + DEF_BUILTIN( aarch64 ); DEF_BUILTIN( armv7tnhl ); DEF_BUILTIN( armv7thl ); DEF_BUILTIN( armv7nhl ); @@ -325,6 +326,7 @@ defCompatibleWith( _armv7nhl(), _noarch(),_armv7hl() ); defCompatibleWith( _armv7thl(), _noarch(),_armv7hl() ); defCompatibleWith( _armv7tnhl(), _noarch(),_armv7hl(),_armv7nhl(),_armv7thl() ); + defCompatibleWith( _aarch64(), _noarch() ); // defCompatibleWith( _sh3(), _noarch() ); // @@ -430,6 +432,7 @@ const Arch Arch_sparcv8( _sparcv8() ); const Arch Arch_sparc( _sparc() ); + const Arch Arch_aarch64( _aarch64() ); const Arch Arch_armv7tnhl( _armv7tnhl() ); const Arch Arch_armv7thl( _armv7thl() ); const Arch Arch_armv7nhl ( _armv7nhl() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/Arch.h new/libzypp-12.11.0/zypp/Arch.h --- old/libzypp-12.10.0/zypp/Arch.h 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/Arch.h 2013-03-28 13:01:31.000000000 +0100 @@ -222,6 +222,8 @@ extern const Arch Arch_sparc; /** \relates Arch */ + extern const Arch Arch_aarch64; + /** \relates Arch */ extern const Arch Arch_armv7tnhl; /** \relates Arch */ extern const Arch Arch_armv7thl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/MediaSetAccess.cc new/libzypp-12.11.0/zypp/MediaSetAccess.cc --- old/libzypp-12.10.0/zypp/MediaSetAccess.cc 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/MediaSetAccess.cc 2013-03-26 17:57:29.000000000 +0100 @@ -256,9 +256,10 @@ reason = media::MediaChangeReport::IO_SOFT; } - // non interactive only bother the user if wrong medium is in the drive - // otherwise propagate the error - if ( ( options & PROVIDE_NON_INTERACTIVE ) && reason != media::MediaChangeReport::WRONG) + // Propagate the original error if _no_ callback receiver is connected, or + // non_interactive mode (for optional files) is used (except for wrong media). + if ( ! callback::SendReport<media::MediaChangeReport>::Distributor::instance().getReceiver() + || (( options & PROVIDE_NON_INTERACTIVE ) && reason != media::MediaChangeReport::WRONG ) ) { MIL << "Can't provide file. Non-Interactive mode." << endl; ZYPP_RETHROW(excp); @@ -284,7 +285,9 @@ if( user == media::MediaChangeReport::ABORT ) { DBG << "Aborting" << endl; - ZYPP_RETHROW ( excp ); + AbortRequestException aexcp("Aborting requested by user"); + aexcp.remember(excp); + ZYPP_THROW(aexcp); } else if ( user == media::MediaChangeReport::IGNORE ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/Url.cc new/libzypp-12.11.0/zypp/Url.cc --- old/libzypp-12.10.0/zypp/Url.cc 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/Url.cc 2013-03-27 12:33:30.000000000 +0100 @@ -215,6 +215,7 @@ ref->config("path_encode_slash2", "y"); // always encode 2. slash addUrlByScheme("ftp", ref); addUrlByScheme("sftp", ref); + addUrlByScheme("tftp", ref); } bool @@ -460,7 +461,7 @@ bool Url::schemeIsRemote( const std::string & scheme_r ) { - static const char * val[] = { "http", "https", "nfs", "nfs4", "smb", "cifs", "ftp", "sftp" }; + static const char * val[] = { "http", "https", "nfs", "nfs4", "smb", "cifs", "ftp", "sftp", "tftp" }; return isInList( arrayBegin(val), arrayEnd(val), scheme_r ); } @@ -472,7 +473,7 @@ bool Url::schemeIsDownloading( const std::string & scheme_r ) { - static const char * val[] = { "http", "https", "ftp", "sftp" }; + static const char * val[] = { "http", "https", "ftp", "sftp", "tftp" }; return isInList( arrayBegin(val), arrayEnd(val), scheme_r ); } /////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/Url.h new/libzypp-12.11.0/zypp/Url.h --- old/libzypp-12.10.0/zypp/Url.h 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/Url.h 2013-03-27 12:33:30.000000000 +0100 @@ -256,7 +256,7 @@ /** \overload nonstatic version */ bool schemeIsLocal() const { return schemeIsLocal( getScheme() ); } - /** nfs nfs4 smb cifs http https ftp sftp */ + /** nfs nfs4 smb cifs http https ftp sftp tftp */ static bool schemeIsRemote( const std::string & scheme_r ); /** \overload nonstatic version */ bool schemeIsRemote() const { return schemeIsRemote( getScheme() ); } @@ -266,7 +266,7 @@ /** \overload nonstatic version */ bool schemeIsVolatile() const { return schemeIsVolatile( getScheme() ); } - /** http https ftp sftp */ + /** http https ftp sftp tftp */ static bool schemeIsDownloading( const std::string & scheme_r ); /** \overload nonstatic version */ bool schemeIsDownloading() const { return schemeIsDownloading( getScheme() ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/VendorAttr.cc new/libzypp-12.11.0/zypp/VendorAttr.cc --- old/libzypp-12.10.0/zypp/VendorAttr.cc 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/VendorAttr.cc 2013-04-05 14:29:29.000000000 +0200 @@ -88,17 +88,22 @@ if ( ! lcent ) { unsigned myid = 0; - // Compare this entry with the global vendor map. - // Reversed to get the longes prefix. - for ( VendorMap::reverse_iterator it = _vendorMap.rbegin(); it != _vendorMap.rend(); ++it ) - { - if ( str::hasPrefix( lcvendor.c_str(), it->first ) ) - { - myid = it->second; - break; // found - } - } - if ( ! myid ) + // bnc#812608: no pefix compare in opensuse namespace + static const IdString openSUSE( "opensuse" ); + if ( lcvendor == openSUSE || ! str::hasPrefix( lcvendor.c_str(), openSUSE.c_str() ) ) + { + // Compare this entry with the global vendor map. + // Reversed to get the longest prefix. + for ( VendorMap::reverse_iterator it = _vendorMap.rbegin(); it != _vendorMap.rend(); ++it ) + { + if ( str::hasPrefix( lcvendor.c_str(), it->first ) ) + { + myid = it->second; + break; // found + } + } + } + if ( ! myid ) { myid = --_nextId; // get a new class ID } @@ -107,7 +112,7 @@ else { ent = lcent; // take the ID from the lowercased vendor string - } + } } return ent; } @@ -164,14 +169,6 @@ _vendorMap["opensuse"] = suseit->second; } - // Take care 'opensuse build service' gets it's own class. - VendorMap::const_iterator obsit( _vendorMap.find("opensuse build service") ); - if ( obsit == _vendorMap.end() ) - { - _vendorMap["opensuse build service"] = ++vendorGroupCounter; - } - - MIL << *this << endl; } @@ -189,7 +186,7 @@ if (nextId != vendorGroupCounter + 1 && nextId != _vendorMap[*it]) { - // We have at least 3 groups which has to be mixed --> mix the third group to the first + // We have at least 3 groups which has to be mixed --> mix the third group to the first unsigned int moveID = _vendorMap[*it]; for_( itMap, _vendorMap.begin(), _vendorMap.end() ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/ZYpp.cc new/libzypp-12.11.0/zypp/ZYpp.cc --- old/libzypp-12.10.0/zypp/ZYpp.cc 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/ZYpp.cc 2013-04-05 14:29:29.000000000 +0200 @@ -15,6 +15,7 @@ #include "zypp/ZYpp.h" #include "zypp/zypp_detail/ZYppImpl.h" #include "zypp/sat/Pool.h" +#include "zypp/ManagedFile.h" using std::endl; @@ -100,6 +101,8 @@ void ZYpp::installSrcPackage( const SrcPackage_constPtr & srcPackage_r ) { _pimpl->installSrcPackage( srcPackage_r ); } + ManagedFile ZYpp::provideSrcPackage( const SrcPackage_constPtr & srcPackage_r ) + {return _pimpl->provideSrcPackage( srcPackage_r ); } /////////////////////////////////////////////////////////////////// void ZYpp::setRequestedLocales( const LocaleSet & locales_r ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/ZYpp.h new/libzypp-12.11.0/zypp/ZYpp.h --- old/libzypp-12.10.0/zypp/ZYpp.h 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/ZYpp.h 2013-04-05 14:29:29.000000000 +0200 @@ -20,6 +20,7 @@ #include "zypp/APIConfig.h" #include "zypp/ZConfig.h" +#include "zypp/ManagedFile.h" #include "zypp/ZYppCommit.h" #include "zypp/ResTraits.h" @@ -118,6 +119,11 @@ */ void installSrcPackage( const SrcPackage_constPtr & srcPackage_r ); + /** Provides a source package on the Target. + * \throws Exception + */ + ManagedFile provideSrcPackage( const SrcPackage_constPtr & srcPackage_r ); + public: /** */ Resolver_Ptr resolver() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/media/MediaAccess.cc new/libzypp-12.11.0/zypp/media/MediaAccess.cc --- old/libzypp-12.10.0/zypp/media/MediaAccess.cc 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/media/MediaAccess.cc 2013-03-27 12:33:30.000000000 +0100 @@ -133,7 +133,7 @@ _handler = new MediaDISK (url,preferred_attach_point); else if (scheme == "cifs" || scheme == "smb") _handler = new MediaCIFS (url,preferred_attach_point); - else if (scheme == "ftp" || scheme == "http" || scheme == "https") + else if (scheme == "ftp" || scheme == "tftp" || scheme == "http" || scheme == "https") { // Another good idea would be activate MediaAria2c handler via external var bool use_aria = false; @@ -182,7 +182,7 @@ else if ( !use_aria && ariaenv && ( strcmp(ariaenv, "1" ) == 0 ) ) { // no aria for ftp - no advantage in that over curl - if ( url.getScheme() == "ftp" ) + if ( url.getScheme() == "ftp" || url.getScheme() == "tftp" ) WAR << "no aria2c for FTP, despite ZYPP_ARIA2C=1" << endl; else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/media/MediaCurl.cc new/libzypp-12.11.0/zypp/media/MediaCurl.cc --- old/libzypp-12.10.0/zypp/media/MediaCurl.cc 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/media/MediaCurl.cc 2013-03-27 12:33:30.000000000 +0100 @@ -240,7 +240,7 @@ else { // if there is no username, set anonymous auth - if ( url.getScheme() == "ftp" && s.username().empty() ) + if ( ( url.getScheme() == "ftp" || url.getScheme() == "tftp" ) && s.username().empty() ) s.setAnonymousAuth(); } @@ -1317,7 +1317,7 @@ { DBG << "HTTP response: " + str::numstring(httpReturnCode); if ( httpReturnCode == 304 - || ( httpReturnCode == 213 && _url.getScheme() == "ftp" ) ) // not modified + || ( httpReturnCode == 213 && (_url.getScheme() == "ftp" || _url.getScheme() == "tftp") ) ) // not modified { DBG << " Not modified."; modified = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/media/MediaManager.h new/libzypp-12.11.0/zypp/media/MediaManager.h --- old/libzypp-12.10.0/zypp/media/MediaManager.h 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/media/MediaManager.h 2013-03-27 12:33:30.000000000 +0100 @@ -342,10 +342,11 @@ * Mandatory URL component, that specifies the share name with * optional subdirectory, where the desired files are located. * - * \subsection MediaCurl_Url MediaCurl - FTP/HTTP directory tree (ftp, http, https) + * \subsection MediaCurl_Url MediaCurl - FTP/HTTP directory tree (ftp, tftp, http, https) * The access handler to media directory tree on a ftp/http server. * - Scheme: * - <b>ftp</b> + * - <b>tftp</b> * - <b>http</b> * - <b>https</b> * - Examples: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/media/MediaMultiCurl.cc new/libzypp-12.11.0/zypp/media/MediaMultiCurl.cc --- old/libzypp-12.10.0/zypp/media/MediaMultiCurl.cc 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/media/MediaMultiCurl.cc 2013-03-27 12:33:30.000000000 +0100 @@ -1511,7 +1511,7 @@ try { string scheme = urliter->getScheme(); - if (scheme == "http" || scheme == "https" || scheme == "ftp") + if (scheme == "http" || scheme == "https" || scheme == "ftp" || scheme == "tftp") { checkProtocol(*urliter); myurllist.push_back(*urliter); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/media/MediaPriority.cc new/libzypp-12.11.0/zypp/media/MediaPriority.cc --- old/libzypp-12.10.0/zypp/media/MediaPriority.cc 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/media/MediaPriority.cc 2013-03-27 12:33:30.000000000 +0100 @@ -33,7 +33,7 @@ /** * 4: local: file,dir,hd * 3: remote: nfs,cifs,smb - * ?: download: http,https,ftp,sftp + * ?: download: http,https,ftp,sftp, tftp * ?: volatile: cd,dvd * 0: the rest */ @@ -57,6 +57,10 @@ RETURN_IF( "file", 4 ); RETURN_IF( "ftp", ZConfig::instance().download_media_prefer_download() ? 2 : 1); break; + + case 't': + RETURN_IF( "tftp", ZConfig::instance().download_media_prefer_download() ? 2 : 1); + break; case 'h': RETURN_IF( "http", ZConfig::instance().download_media_prefer_download() ? 2 : 1 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/media/ZsyncParser.cc new/libzypp-12.11.0/zypp/media/ZsyncParser.cc --- old/libzypp-12.10.0/zypp/media/ZsyncParser.cc 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/media/ZsyncParser.cc 2013-03-27 12:33:30.000000000 +0100 @@ -81,7 +81,7 @@ (void)sscanf(buf + 14, "%d,%d,%d", &sql, &rsl, &csl); else if (!strncmp(buf, "Blocksize: ", 11)) blksize = atoi(buf + 11); - else if (!strncmp(buf, "URL: http://";, 12) || !strncmp(buf, "URL: https://";, 13) || !strncmp(buf, "URL: ftp://";, 11)) + else if (!strncmp(buf, "URL: http://";, 12) || !strncmp(buf, "URL: https://";, 13) || !strncmp(buf, "URL: ftp://";, 11) || !strncmp(buf, "URL: tftp://";, 12) ) urls.push_back(buf + 5); else if (!strncmp(buf, "SHA-1: ", 7)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/parser/yum/schema/common-inc.rnc new/libzypp-12.11.0/zypp/parser/yum/schema/common-inc.rnc --- old/libzypp-12.10.0/zypp/parser/yum/schema/common-inc.rnc 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/parser/yum/schema/common-inc.rnc 2013-03-28 13:01:31.000000000 +0100 @@ -51,6 +51,7 @@ | "sparcv9" | "sparcv8" | "sparc" + | "aarch64" | "armv7tnhl" | "armv7thl" | "armv7nhl" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/parser/yum/schema/common-inc.rng new/libzypp-12.11.0/zypp/parser/yum/schema/common-inc.rng --- old/libzypp-12.10.0/zypp/parser/yum/schema/common-inc.rng 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/parser/yum/schema/common-inc.rng 2013-03-28 13:01:31.000000000 +0100 @@ -114,6 +114,7 @@ <value>sparcv9</value> <value>sparcv8</value> <value>sparc</value> + <value>aarch64</value> <value>armv7tnhl</value> <value>armv7thl</value> <value>armv7nhl</value> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/target/TargetImpl.cc new/libzypp-12.11.0/zypp/target/TargetImpl.cc --- old/libzypp-12.10.0/zypp/target/TargetImpl.cc 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/target/TargetImpl.cc 2013-04-05 14:29:29.000000000 +0200 @@ -1812,14 +1812,19 @@ void TargetImpl::installSrcPackage( const SrcPackage_constPtr & srcPackage_r ) { // provide on local disk - repo::RepoMediaAccess access_r; - repo::SrcPackageProvider prov( access_r ); - ManagedFile localfile = prov.provideSrcPackage( srcPackage_r ); + ManagedFile localfile = provideSrcPackage(srcPackage_r); // install it rpm().installPackage ( localfile ); } - ///////////////////////////////////////////////////////////////// + ManagedFile TargetImpl::provideSrcPackage( const SrcPackage_constPtr & srcPackage_r ) + { + // provide on local disk + repo::RepoMediaAccess access_r; + repo::SrcPackageProvider prov( access_r ); + return prov.provideSrcPackage( srcPackage_r ); + } + //////////////////////////////////////////////////////////////// } // namespace target /////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/target/TargetImpl.h new/libzypp-12.11.0/zypp/target/TargetImpl.h --- old/libzypp-12.10.0/zypp/target/TargetImpl.h 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/target/TargetImpl.h 2013-04-05 14:29:29.000000000 +0200 @@ -29,6 +29,7 @@ #include "zypp/target/RequestedLocalesFile.h" #include "zypp/target/SoftLocksFile.h" #include "zypp/target/HardLocksFile.h" +#include "zypp/ManagedFile.h" /////////////////////////////////////////////////////////////////// namespace zypp @@ -131,6 +132,9 @@ /** Install a source package on the Target. */ void installSrcPackage( const SrcPackage_constPtr & srcPackage_r ); + /** Provides a source package on the Target. */ + ManagedFile provideSrcPackage( const SrcPackage_constPtr & srcPackage_r ); + /** Overload to realize stream output. */ virtual std::ostream & dumpOn( std::ostream & str ) const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/zypp_detail/ZYppImpl.cc new/libzypp-12.11.0/zypp/zypp_detail/ZYppImpl.cc --- old/libzypp-12.10.0/zypp/zypp_detail/ZYppImpl.cc 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/zypp_detail/ZYppImpl.cc 2013-04-05 14:29:29.000000000 +0200 @@ -162,6 +162,13 @@ _target->_pimpl->installSrcPackage( srcPackage_r ); } + ManagedFile ZYppImpl::provideSrcPackage( const SrcPackage_constPtr & srcPackage_r ) + { + if (! _target) + ZYPP_THROW( Exception("Target not initialized.") ); + return _target->_pimpl->provideSrcPackage( srcPackage_r ); + } + //------------------------------------------------------------------------ // target store path diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.10.0/zypp/zypp_detail/ZYppImpl.h new/libzypp-12.11.0/zypp/zypp_detail/ZYppImpl.h --- old/libzypp-12.10.0/zypp/zypp_detail/ZYppImpl.h 2013-03-10 01:44:25.000000000 +0100 +++ new/libzypp-12.11.0/zypp/zypp_detail/ZYppImpl.h 2013-04-05 14:29:29.000000000 +0200 @@ -21,6 +21,7 @@ #include "zypp/ZYppCommit.h" #include "zypp/ResTraits.h" #include "zypp/DiskUsageCounter.h" +#include "zypp/ManagedFile.h" using namespace zypp::filesystem; @@ -92,6 +93,9 @@ /** Install a source package on the Target. */ void installSrcPackage( const SrcPackage_constPtr & srcPackage_r ); + /** Install a source package on the Target. */ + ManagedFile provideSrcPackage( const SrcPackage_constPtr & srcPackage_r ); + public: /** Get the path where zypp related plugins store persistent data and caches */ Pathname homePath() const; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
