From: Klaus Kaempf Date: Sat, 11 Mar 2006 06:42:32 +0000 (+0000) Subject: 'freshen' -> 'freshens' consistenly everywhere even in variable names X-Git-Tag: 6.6.0~4255 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0790b454614b67d6f3308ce77d6eadc299ae1374;p=platform%2Fupstream%2Flibzypp.git 'freshen' -> 'freshens' consistenly everywhere even in variable names --- diff --git a/zypp/parser/yum/YUMParserData.cc b/zypp/parser/yum/YUMParserData.cc index 50d886e6b..afa0288d7 100644 --- a/zypp/parser/yum/YUMParserData.cc +++ b/zypp/parser/yum/YUMParserData.cc @@ -296,8 +296,8 @@ namespace zypp { << "media: " << data.media << endl << "dirsizes: " << endl << data.dirSizes << endl - << "freshen: " << endl - << data.freshen << endl + << "freshens: " << endl + << data.freshens << endl << "install-only: '" << data.installOnly << "'" << endl; return out; } @@ -340,7 +340,7 @@ namespace zypp { << "suggests:" << endl << data.suggests << endl << "supplements:" << endl << data.supplements << endl << "enhances:" << endl << data.enhances << endl - << "freshen: " << endl << data.freshen << endl; + << "freshens: " << endl << data.freshens << endl; return out; } @@ -384,7 +384,7 @@ namespace zypp { << " provides: " << data.provides << endl << " conflicts: " << data.conflicts << endl << " obsoletes: " << data.obsoletes << endl - << " freshen: " << data.freshen << endl + << " freshens: " << data.freshens << endl << " requires: " << data.requires << endl << " recommends:" << endl << data.recommends << endl << " suggests:" << endl << data.suggests << endl @@ -425,7 +425,7 @@ namespace zypp { << " provides: " << data.provides << endl << " conflicts: " << data.conflicts << endl << " obsoletes: " << data.obsoletes << endl - << " freshen: " << data.freshen << endl + << " freshens: " << data.freshens << endl << " requires: " << data.requires << endl << " recommends:" << endl << data.recommends << endl << " suggests:" << endl << data.suggests << endl @@ -467,7 +467,7 @@ namespace zypp { << " provides: " << data.provides << endl << " conflicts: " << data.conflicts << endl << " obsoletes: " << data.obsoletes << endl - << " freshen: " << data.freshen << endl + << " freshens: " << data.freshens << endl << " requires: " << data.requires << endl << " recommends:" << endl << data.recommends << endl << " suggests:" << endl << data.suggests << endl @@ -487,7 +487,7 @@ namespace zypp { << " provides: " << data.provides << endl << " conflicts: " << data.conflicts << endl << " obsoletes: " << data.obsoletes << endl - << " freshen: " << data.freshen << endl + << " freshens: " << data.freshens << endl << " requires: " << data.requires << endl << " recommends:" << endl << data.recommends << endl << " suggests:" << endl << data.suggests << endl @@ -548,8 +548,8 @@ namespace zypp { << " media: " << data.media << endl << " dirsizes: " << endl << data.dirSizes << endl - << " freshen: " << endl - << data.freshen << endl + << " freshens: " << endl + << data.freshens << endl << " install-only: '" << data.installOnly << "'" << endl << " files:" << endl << data.files << endl diff --git a/zypp/parser/yum/YUMParserData.h b/zypp/parser/yum/YUMParserData.h index b41fc1da0..000a503a9 100644 --- a/zypp/parser/yum/YUMParserData.h +++ b/zypp/parser/yum/YUMParserData.h @@ -168,7 +168,7 @@ namespace zypp { std::list provides; std::list conflicts; std::list obsoletes; - std::list freshen; + std::list freshens; std::list requires; std::list recommends; std::list suggests; diff --git a/zypp/parser/yum/YUMPatchParser.cc b/zypp/parser/yum/YUMPatchParser.cc index 694292b52..458c2185e 100644 --- a/zypp/parser/yum/YUMPatchParser.cc +++ b/zypp/parser/yum/YUMPatchParser.cc @@ -113,7 +113,7 @@ namespace zypp { prim.parseDependencyEntries(& patchPtr->enhances, child); } else if (name == "freshens") { - prim.parseDependencyEntries(& patchPtr->freshen, child); + prim.parseDependencyEntries(& patchPtr->freshens, child); } else if (name == "category") { patchPtr->category = _helper.content(child); @@ -249,7 +249,7 @@ XXX << "parseFormatNode(" << name << ")" << endl; prim.parseDirsizeEntries(& dataPtr->dirSizes, child); } else if (name == "freshens") { - prim.parseDependencyEntries(& dataPtr->freshen, child); + prim.parseDependencyEntries(& dataPtr->freshens, child); } else if (name == "install_only") { dataPtr->installOnly = true; @@ -516,7 +516,7 @@ XXX << "parsePackageNode(" << name << ")" << endl; prim.parseDependencyEntries(& script->enhances, child); } else if (name == "freshens") { - prim.parseDependencyEntries(& script->freshen, child); + prim.parseDependencyEntries(& script->freshens, child); } else { WAR << "YUM contains the unknown element <" @@ -578,7 +578,7 @@ XXX << "parsePackageNode(" << name << ")" << endl; prim.parseDependencyEntries(& message->enhances, child); } else if (name == "freshens") { - prim.parseDependencyEntries(& message->freshen, child); + prim.parseDependencyEntries(& message->freshens, child); } else { WAR << "YUM contains the unknown element <" diff --git a/zypp/parser/yum/YUMPatternParser.cc b/zypp/parser/yum/YUMPatternParser.cc index 4758b38e4..5f268a70c 100644 --- a/zypp/parser/yum/YUMPatternParser.cc +++ b/zypp/parser/yum/YUMPatternParser.cc @@ -111,8 +111,8 @@ namespace zypp { else if (name == "enhances") { prim.parseDependencyEntries(& dataPtr->enhances, child); } - else if (name == "freshen") { - prim.parseDependencyEntries(& dataPtr->freshen, child); + else if (name == "freshens") { + prim.parseDependencyEntries(& dataPtr->freshens, child); } else { WAR << "YUM contains the unknown element <" << name << "> " diff --git a/zypp/parser/yum/YUMPrimaryParser.cc b/zypp/parser/yum/YUMPrimaryParser.cc index baf1301b2..2c0313e1d 100644 --- a/zypp/parser/yum/YUMPrimaryParser.cc +++ b/zypp/parser/yum/YUMPrimaryParser.cc @@ -205,8 +205,8 @@ namespace zypp { else if (name == "dirsizes") { parseDirsizeEntries(& dataPtr->dirSizes, child); } - else if (name == "freshen") { - parseDependencyEntries(& dataPtr->freshen, child); + else if (name == "freshens") { + parseDependencyEntries(& dataPtr->freshens, child); } else if (name == "install_only") { dataPtr->installOnly = true; diff --git a/zypp/parser/yum/YUMProductParser.cc b/zypp/parser/yum/YUMProductParser.cc index a5841e3e6..33f6ef5ce 100644 --- a/zypp/parser/yum/YUMProductParser.cc +++ b/zypp/parser/yum/YUMProductParser.cc @@ -112,8 +112,8 @@ namespace zypp { else if (name == "enhances") { prim.parseDependencyEntries(& productPtr->enhances, child); } - else if (name == "freshen") { - prim.parseDependencyEntries(& productPtr->freshen, child); + else if (name == "freshens") { + prim.parseDependencyEntries(& productPtr->freshens, child); } else { WAR << "YUM contains the unknown element <" << name << "> " diff --git a/zypp/parser/yum/schema/patch.rnc b/zypp/parser/yum/schema/patch.rnc index 0ac147188..f2f469317 100644 --- a/zypp/parser/yum/schema/patch.rnc +++ b/zypp/parser/yum/schema/patch.rnc @@ -41,7 +41,7 @@ dependency-block = element-provides?, element-conflicts?, element-obsoletes?, - element-freshen?, + element-freshens?, element-requires?, element-recommends?, element-suggests?, diff --git a/zypp/parser/yum/schema/patch.rng b/zypp/parser/yum/schema/patch.rng index f0e9f9dda..dfb744470 100644 --- a/zypp/parser/yum/schema/patch.rng +++ b/zypp/parser/yum/schema/patch.rng @@ -100,7 +100,7 @@ - + diff --git a/zypp/parser/yum/schema/suse-primary.rnc b/zypp/parser/yum/schema/suse-primary.rnc index 75e19881a..fa4cfea05 100644 --- a/zypp/parser/yum/schema/suse-primary.rnc +++ b/zypp/parser/yum/schema/suse-primary.rnc @@ -48,7 +48,7 @@ suse-additional-format = element-keywords?, element-media?, element-dirsizes?, - element-freshen?, + element-freshens?, element-install_only? suse-provides = @@ -69,7 +69,7 @@ suse-obsoletes = usual-entry-or-capability+ suse-dependencies = - element-provides? & element-conflicts? & element-obsoletes? & freshen? & element-requires? & element-suggests? & element-enhances? & element-supplements? & element-recommends? + element-provides? & element-conflicts? & element-obsoletes? & freshens? & element-requires? & element-suggests? & element-enhances? & element-supplements? & element-recommends? element-authors = element authors { authors } @@ -107,10 +107,10 @@ dirsize = attribute filecount { text }, empty -element-freshen = - ( element suse:freshen { freshen } | element freshen { freshen } ) +element-freshens = + ( element suse:freshens { freshens } | element freshens { freshens } ) -freshen = +freshens = usual-entry-or-capability+ element-install_only = diff --git a/zypp/parser/yum/schema/suse-primary.rng b/zypp/parser/yum/schema/suse-primary.rng index 58e094bfa..53ceaeed3 100644 --- a/zypp/parser/yum/schema/suse-primary.rng +++ b/zypp/parser/yum/schema/suse-primary.rng @@ -125,7 +125,7 @@ - + @@ -183,7 +183,7 @@ - + @@ -258,17 +258,17 @@ - + - - + + - - + + - + diff --git a/zypp/source/yum/YUMSourceImpl.cc b/zypp/source/yum/YUMSourceImpl.cc index 00dfbf138..21c651149 100644 --- a/zypp/source/yum/YUMSourceImpl.cc +++ b/zypp/source/yum/YUMSourceImpl.cc @@ -759,8 +759,8 @@ namespace zypp _deps[Dep::OBSOLETES].insert(createCapability(*it, my_kind)); } - for (std::list::const_iterator it = parsed.freshen.begin(); - it != parsed.freshen.end(); + for (std::list::const_iterator it = parsed.freshens.begin(); + it != parsed.freshens.end(); it++) { _deps[Dep::FRESHENS].insert(createCapability(*it, my_kind)); diff --git a/zypp/target/store/XMLFilesBackend.cc b/zypp/target/store/XMLFilesBackend.cc index 4435787a9..a2163ec03 100644 --- a/zypp/target/store/XMLFilesBackend.cc +++ b/zypp/target/store/XMLFilesBackend.cc @@ -883,7 +883,7 @@ XMLFilesBackend::createDependencies( const zypp::parser::yum::YUMObjectData & pa _deps[Dep::OBSOLETES].insert(createCapability(*it, my_kind)); } - for (std::list::const_iterator it = parsed.freshen.begin(); it != parsed.freshen.end(); it++) + for (std::list::const_iterator it = parsed.freshens.begin(); it != parsed.freshens.end(); it++) { _deps[Dep::FRESHENS].insert(createCapability(*it, my_kind)); }