X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=zypp%2Ftarget%2Frpm%2FRpmDb.h;h=956ba25393cb289f198d788331958904f6b0ac99;hb=b1beb1b072b979e151700e9267329918ec03010f;hp=f2766c1147cb5cafbc34f4d6fca8a4b97981748c;hpb=e7df77d3f25679515f05aba52f358389f74de9af;p=platform%2Fupstream%2Flibzypp.git diff --git a/zypp/target/rpm/RpmDb.h b/zypp/target/rpm/RpmDb.h index f2766c1..956ba25 100644 --- a/zypp/target/rpm/RpmDb.h +++ b/zypp/target/rpm/RpmDb.h @@ -426,7 +426,7 @@ public: * checkPackage result * @see checkPackage * */ - enum CheckPackageResult + enum checkPackageResult { CHK_OK = 0, /*!< Signature is OK. */ CHK_NOTFOUND = 1, /*!< Signature is unknown type. */ @@ -436,24 +436,14 @@ public: CHK_ERROR = 5 /*!< File does not exist or can't be opened. */ }; - /** Detailed rpm signature check log messages - * A single multiline message if \ref CHK_OK. Otherwise each message line - * together with it's \ref CheckPackageResult. - */ - struct CheckPackageDetail : std::vector> - {}; - /** * Check signature of rpm file on disk. * - * @param path_r which file to check - * @param detail_r Return detailed rpm log messages + * @param filename which file to check * - * @return CheckPackageResult + * @return checkPackageResult */ - CheckPackageResult checkPackage( const Pathname & path_r, CheckPackageDetail & detail_r ); - /** \overload Ignoring the \a datails_r */ - CheckPackageResult checkPackage( const Pathname & path_r ); + checkPackageResult checkPackage( const Pathname & path_r ); /** install rpm package * @@ -549,12 +539,6 @@ protected: void doRebuildDatabase(callback::SendReport & report); }; -/** \relates RpmDb::CheckPackageResult Stream output */ -std::ostream & operator<<( std::ostream & str, RpmDb::CheckPackageResult obj ); - -/** \relates RpmDb::checkPackageDetail Stream output */ -std::ostream & operator<<( std::ostream & str, const RpmDb::CheckPackageDetail & obj ); - } // namespace rpm } // namespace target } // namespace zypp