'freshen' -> 'freshens' consistenly everywhere even in variable names

diff --git a/zypp/parser/yum/YUMParserData.cc b/zypp/parser/yum/YUMParserData.cc
index 50d886e6bf51f3b2ccb52fa65d2fd27083f700e1..afa0288d7f1edb55769138e288eb3d533ba7c6b1 100644 (file)
--- 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 b41fc1da06894efcace8dad4817a3ed8c39bd2be..000a503a9b151b0dadbb96d50275fdabadae6a3f 100644 (file)
--- a/zypp/parser/yum/YUMParserData.h
+++ b/zypp/parser/yum/YUMParserData.h
@@ -168,7 +168,7 @@ namespace zypp {
         std::list<YUMDependency> provides;
         std::list<YUMDependency> conflicts;
         std::list<YUMDependency> obsoletes;
-        std::list<YUMDependency> freshen;
+        std::list<YUMDependency> freshens;
         std::list<YUMDependency> requires;
         std::list<YUMDependency> recommends;
         std::list<YUMDependency> suggests;

diff --git a/zypp/parser/yum/YUMPatchParser.cc b/zypp/parser/yum/YUMPatchParser.cc
index 694292b522b5937d591f462b09679135a5ecc4c5..458c2185e30858bb504b861250e279cc2e1ca871 100644 (file)
--- 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 <atoms/script> 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 <atoms/message> contains the unknown element <"

diff --git a/zypp/parser/yum/YUMPatternParser.cc b/zypp/parser/yum/YUMPatternParser.cc
index 4758b38e44ce42aac816e68c4266fc560f1a18fe..5f268a70c01641d0724a7a3d6a5a6ee2326da7ea 100644 (file)
--- 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 <pattern> contains the unknown element <" << name << "> "

diff --git a/zypp/parser/yum/YUMPrimaryParser.cc b/zypp/parser/yum/YUMPrimaryParser.cc
index baf1301b28c3f498bc49523a6e04e3ba3f6f193d..2c0313e1da41fa570c1be8d0d6020b6c68b7658f 100644 (file)
--- 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 a5841e3e6a0946a4cb796f1de92e2aa9f8f04fde..33f6ef5ce160fb7eac8e807813a7846aa84d32dd 100644 (file)
--- 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 <data> contains the unknown element <" << name << "> "

diff --git a/zypp/parser/yum/schema/patch.rnc b/zypp/parser/yum/schema/patch.rnc
index 0ac147188147abd2169aa4a32182d05b42bce637..f2f469317c6139d53fed8486780f7032319c819d 100644 (file)
--- 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 f0e9f9dda659e4f27ae756f0c43c7d8a12c24c5a..dfb744470df40dbc7cd2b90366848e339c84842d 100644 (file)
--- a/zypp/parser/yum/schema/patch.rng
+++ b/zypp/parser/yum/schema/patch.rng
@@ -100,7 +100,7 @@
       <ref name="element-obsoletes"/>
     </optional>
     <optional>
-      <ref name="element-freshen"/>
+      <ref name="element-freshens"/>
     </optional>
     <optional>
       <ref name="element-requires"/>

diff --git a/zypp/parser/yum/schema/suse-primary.rnc b/zypp/parser/yum/schema/suse-primary.rnc
index 75e19881a4a070edab8251463d368b13567cc8f5..fa4cfea053886bf47e0867f83774e7124eeeab21 100644 (file)
--- 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 58e094bfa5e58b198333dcb198826856ab2cbcfc..53ceaeed32530e67cb1a0048bf4ad95b9c7bd143 100644 (file)
--- a/zypp/parser/yum/schema/suse-primary.rng
+++ b/zypp/parser/yum/schema/suse-primary.rng
@@ -125,7 +125,7 @@
       <ref name="element-dirsizes"/>
     </optional>
     <optional>
-      <ref name="element-freshen"/>
+      <ref name="element-freshens"/>
     </optional>
     <optional>
       <ref name="element-install_only"/>
@@ -183,7 +183,7 @@
         <ref name="element-obsoletes"/>
       </optional>
       <optional>
-        <ref name="freshen"/>
+        <ref name="freshens"/>
       </optional>
       <optional>
         <ref name="element-requires"/>
@@ -258,17 +258,17 @@
     <attribute name="filecount"/>
     <empty/>
   </define>
-  <define name="element-freshen">
+  <define name="element-freshens">
     <choice>
-      <element name="suse:freshen">
-        <ref name="freshen"/>
+      <element name="suse:freshens">
+        <ref name="freshens"/>
       </element>
-      <element name="freshen">
-        <ref name="freshen"/>
+      <element name="freshens">
+        <ref name="freshens"/>
       </element>
     </choice>
   </define>
-  <define name="freshen">
+  <define name="freshens">
     <oneOrMore>
       <ref name="usual-entry-or-capability"/>
     </oneOrMore>

diff --git a/zypp/source/yum/YUMSourceImpl.cc b/zypp/source/yum/YUMSourceImpl.cc
index 00dfbf138ca5c6daa471bc2f1cb120faf1c5387f..21c651149cb05d59397c0f0e85238e540d5139ab 100644 (file)
--- 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<YUMDependency>::const_iterator it = parsed.freshen.begin();
-       it != parsed.freshen.end();
+    for (std::list<YUMDependency>::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 4435787a9aa5d4db74e5cbcbf35bbbaf16b069da..a2163ec0386bf03c63d522fb07d75a23c8f65883 100644 (file)
--- 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<YUMDependency>::const_iterator it = parsed.freshen.begin(); it != parsed.freshen.end(); it++)
+  for (std::list<YUMDependency>::const_iterator it = parsed.freshens.begin(); it != parsed.freshens.end(); it++)
   {
     _deps[Dep::FRESHENS].insert(createCapability(*it, my_kind));
   }