Author: mlandres Date: Mon Oct 20 16:48:05 2008 New Revision: 11419 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11419&view=rev Log: RepoInfo: Add methods to handle repository licenses. (bnc #372386) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/RepoManager.h Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11419&r1=11418&r2=11419&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Mon Oct 20 16:48:05 2008 @@ -59,7 +59,7 @@ # changes file. See './mkChangelog -h' for help. # SET(LIBZYPP_MAJOR "5") -SET(LIBZYPP_COMPATMINOR "16") +SET(LIBZYPP_COMPATMINOR "17") SET(LIBZYPP_MINOR "17") SET(LIBZYPP_PATCH "0") # Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=11419&r1=11418&r2=11419&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Oct 20 16:48:05 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 20 16:44:58 CEST 2008 - ma@suse.de + +- RepoInfo: Add methods to handle repository licenses. (bnc #372386) +- revision 11419 + +------------------------------------------------------------------- Mon Oct 20 16:39:41 CEST 2008 - ma@suse.de - Adapt to changed satsolver dataiterator API. Modified: trunk/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=11419&r1=11418&r2=11419&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Mon Oct 20 16:48:05 2008 @@ -1900,6 +1900,7 @@ return repo::ServiceType::NONE; } +#if 0 //////////////////////////////////////////////////////////////////////////// // // Misc. utils @@ -2075,7 +2076,7 @@ } // Pathname getInfoFile( const RepoInfo & repo ) media.1/info.txt - +#endif //////////////////////////////////////////////////////////////////////////// std::ostream & operator<<( std::ostream & str, const RepoManager & obj ) Modified: trunk/libzypp/zypp/RepoManager.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.h?rev=11419&r1=11418&r2=11419&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoManager.h (original) +++ trunk/libzypp/zypp/RepoManager.h Mon Oct 20 16:48:05 2008 @@ -649,49 +649,6 @@ out); } - /** - * Checks for existing repository license files of \a repo and extract them - * in \a target directory. - * - * \param repo Repository to check. - * \param target Path to directory where the license files should be copied. - * \return true if license files were found and successfully extracted, - * false otherwise. - */ - bool getLicenseFiles(const RepoInfo & repo, const Pathname & target) ZYPP_DEPRECATED; - - /** - * Returns path to a license file suitable for current system locale, given - * a directory with all available license files. License files' names must - * match the following regex: <tt>^license\.?(.*)\.txt$</tt> where the - * substring enclosed in parentheses is the locale code. - * - * Examples: license.en_US.txt, license.en.txt, license.txt - * - * \param ldir Path to a directory containing all license files. - * \return path to the license file, or an empty path on failure. - * - * \see getLicenseFiles(RepoInfo const&, Pathanme const&) - */ - Pathname getLicenseFile( const Pathname & ldir ) ZYPP_DEPRECATED; - - /** - * Returns path to a license file suitable for given \a locale, given - * a directory with all available license files. - * - * \param ldir Path to a directory containing all license files. - * \return path to the license file, or an empty path on failure. - * - * \see getLicenseFiles(RepoInfo const&, Pathanme const&) - * \see getLicenseFile(Pathanme const&) - */ - Pathname getLicenseFile( const Pathname & ldir, const Locale & locale ) ZYPP_DEPRECATED; - - /** - * \todo implement - */ - std::set<Locale> getAvailableLicenseLocales( const Pathname & ldir ) ZYPP_DEPRECATED; - protected: RepoStatus rawMetadataStatus( const RepoInfo &info ); void setCacheStatus( const RepoInfo &info, const RepoStatus &status ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org