better name for the tag

diff --git a/zypp/source/susetags/SuseTagsImpl.cc b/zypp/source/susetags/SuseTagsImpl.cc
index cd345ed..acce8d5 100644 (file)
--- a/zypp/source/susetags/SuseTagsImpl.cc
+++ b/zypp/source/susetags/SuseTagsImpl.cc
@@ -210,7 +210,6 @@ namespace zypp
           ERR << "cannot parse content file" << endl;
         }
   
-#warning We use suse instead of <DATADIR> for now
         p = cache ? _data_dir + "packages" : provideFile( _data_dir + "packages");
         DBG << "Going to parse " << p << endl;
         PkgContent content( parsePackages( source_r, this, p ) );

diff --git a/zypp/target/store/serialize.cc b/zypp/target/store/serialize.cc
index 2c9f107..c4e02ff 100644 (file)
--- a/zypp/target/store/serialize.cc
+++ b/zypp/target/store/serialize.cc
@@ -377,7 +377,7 @@ std::string toXML( const PersistentStorage::SourceData &obj )
 {
   stringstream out;
   out << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << std::endl;
-  out << "<source-cache  xmlns=\"http://novell.com/package/metadata/suse/source-cache\">" << std::endl;
+  out << "<source  xmlns=\"http://novell.com/package/metadata/suse/source\">" << std::endl;
   out << "  <enabled>" << (obj.enabled ? "true" : "false" ) << "</enabled>" << std::endl;
   out << "  <auto-refresh>" << ( obj.autorefresh ? "true" : "false" ) << "</auto-refresh>" << std::endl;
   out << "  <product-dir>" << xml_escape(obj.product_dir) << "</product-dir>" << std::endl;
@@ -385,7 +385,7 @@ std::string toXML( const PersistentStorage::SourceData &obj )
   out << "  <type>" << xml_escape(obj.type) << "</type>" << std::endl;
    out << "  <url>" << xml_escape(obj.url) << "</url>" << std::endl;
    out << "  <alias>" << xml_escape(obj.alias) << "</alias>" << std::endl;
-  out << "</source-cache>" << std::endl;
+  out << "</source>" << std::endl;
   return out.str();
 }
 

diff --git a/zypp/target/store/xml/XMLSourceCacheParser.cc b/zypp/target/store/xml/XMLSourceCacheParser.cc
index 8ca88e3..2461855 100644 (file)
--- a/zypp/target/store/xml/XMLSourceCacheParser.cc
+++ b/zypp/target/store/xml/XMLSourceCacheParser.cc
@@ -42,7 +42,7 @@ namespace zypp {
       bool 
       XMLSourceCacheParser::isInterested(const xmlNodePtr nodePtr)
       {
-        return _helper.isElement(nodePtr) && _helper.name(nodePtr) == "source-cache";
+        return _helper.isElement(nodePtr) && _helper.name(nodePtr) == "source";
       }
       
       // do the actual processing