From 298c152851f7107333ae595fc2c0fc22488d950d Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Wed, 23 Nov 2005 11:31:11 +0000 Subject: [PATCH] parse also kind of dependency target --- zypp/parser/yum/YUMParserData.cc | 8 ++++++-- zypp/parser/yum/YUMParserData.h | 4 +++- zypp/parser/yum/YUMPrimaryParser.cc | 3 ++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/zypp/parser/yum/YUMParserData.cc b/zypp/parser/yum/YUMParserData.cc index 4d9ed18..d816692 100644 --- a/zypp/parser/yum/YUMParserData.cc +++ b/zypp/parser/yum/YUMParserData.cc @@ -22,13 +22,15 @@ namespace zypp { YUMDependency::YUMDependency() { } - YUMDependency::YUMDependency(const std::string& name, + YUMDependency::YUMDependency(const std::string& kind, + const std::string& name, const std::string& flags, const std::string& epoch, const std::string& ver, const std::string& rel, const std::string& pre) - : name(name), + : kind(kind), + name(name), flags(flags), epoch(epoch), ver(ver), @@ -175,6 +177,8 @@ using namespace zypp::parser::yum; ostream& operator<<(ostream &out, const YUMDependency& data) { + if (! data.kind.empty()) + out << "[" << data.kind << "] "; out << data.name << " " << data.flags << " "; if (! data.epoch.empty()) out << data.epoch << "-"; diff --git a/zypp/parser/yum/YUMParserData.h b/zypp/parser/yum/YUMParserData.h index 3156795..e477838 100644 --- a/zypp/parser/yum/YUMParserData.h +++ b/zypp/parser/yum/YUMParserData.h @@ -49,12 +49,14 @@ namespace zypp { class YUMDependency { public: YUMDependency(); - YUMDependency(const std::string& name, + YUMDependency(const std::string& kind, + const std::string& name, const std::string& flags, const std::string& epoch, const std::string& ver, const std::string& rel, const std::string& pre); + std::string kind; std::string name; std::string flags; std::string epoch; diff --git a/zypp/parser/yum/YUMPrimaryParser.cc b/zypp/parser/yum/YUMPrimaryParser.cc index c785f49..77aa190 100644 --- a/zypp/parser/yum/YUMPrimaryParser.cc +++ b/zypp/parser/yum/YUMPrimaryParser.cc @@ -219,7 +219,8 @@ namespace zypp { string name = _helper.name(child); if (name == "entry") { depList->push_back - (YUMDependency(_helper.attribute(child,"name"), + (YUMDependency(_helper.attribute(child,"kind"), + _helper.attribute(child,"name"), _helper.attribute(child,"flags"), _helper.attribute(child,"epoch"), _helper.attribute(child,"ver"), -- 2.7.4