From 5d780d8818aed2331f977ed0ece0f10432815ddb Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P Date: Wed, 8 Feb 2006 11:08:01 +0000 Subject: [PATCH] more fixes, it seems yum parser is not parsing package lists, I get empty ones --- zypp/target/store/XMLFilesBackend.cc | 13 ++++++++----- zypp/target/store/serialize.cc | 4 +++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/zypp/target/store/XMLFilesBackend.cc b/zypp/target/store/XMLFilesBackend.cc index be72d5d..b245be6 100644 --- a/zypp/target/store/XMLFilesBackend.cc +++ b/zypp/target/store/XMLFilesBackend.cc @@ -398,11 +398,10 @@ XMLFilesBackend::createPatch( const zypp::parser::yum::YUMPatchData & parsed ) c impl->_category = parsed.category; impl->_reboot_needed = parsed.rebootNeeded; impl->_affects_pkg_manager = parsed.packageManager; - /* impl._atoms -> std::list > parsed.atoms */ - /* - impl._summary from parsed.summary (list of MultiLang.(lang and text)); - impl._description from parsed.summary (list of MultiLang.(lang and text)); - */ + // impl._atoms -> std::list > parsed.atoms */ + + impl->_summary = parsed.summary; + impl->_description = parsed.summary; // Collect basic Resolvable data NVRAD dataCollect( parsed.name, @@ -498,6 +497,7 @@ XMLFilesBackend::createSelection( const zypp::parser::yum::YUMGroupData & parsed { try { + DBG << parsed << std::endl; shared_ptr impl(new XMLSelectionImpl()); /* YUMGroupData(); @@ -510,6 +510,7 @@ XMLFilesBackend::createSelection( const zypp::parser::yum::YUMGroupData & parsed std::list packageList; */ impl->_summary = parsed.description; + //impl->_description = parsed.description; impl->_name = parsed.groupId; //impl->_order = parsed.summary; //impl->_category = parsed.summary; @@ -517,6 +518,7 @@ XMLFilesBackend::createSelection( const zypp::parser::yum::YUMGroupData & parsed for( std::list::const_iterator it = parsed.grouplist.begin(); it != parsed.grouplist.end(); ++it) { + DBG << "Selection dependencies" << std::endl; if ((*it).type == "optional" ) impl->_suggests.insert((*it).name); if ((*it).type == "mandatory" ) @@ -524,6 +526,7 @@ XMLFilesBackend::createSelection( const zypp::parser::yum::YUMGroupData & parsed } for( std::list::const_iterator it = parsed.packageList.begin(); it != parsed.packageList.end(); ++it) { + DBG << "Selection package dependencies" << std::endl; impl->_install_packages.insert((*it).name); } // Collect basic Resolvable data diff --git a/zypp/target/store/serialize.cc b/zypp/target/store/serialize.cc index d9b5bc4..d0317a0 100644 --- a/zypp/target/store/serialize.cc +++ b/zypp/target/store/serialize.cc @@ -209,7 +209,9 @@ std::string toXML( const Selection::constPtr &obj ) out << " " << obj->name() << "" << std::endl; //out << " "<< (obj->default() ? "true" : "false" ) << "" << std::endl; out << " "<< (obj->visible() ? "true" : "false" ) << "" << std::endl; - + + out << " "<< (obj->description()) << "" << std::endl; + out << " " << std::endl; //recommended selections std::set rec_sel = obj->recommends(); -- 2.7.4