move the media verifier setting to the corresponding Source type

diff --git a/zypp/source/SourceImpl.cc b/zypp/source/SourceImpl.cc
index 3f8ad63..33e3e53 100644 (file)
--- a/zypp/source/SourceImpl.cc
+++ b/zypp/source/SourceImpl.cc
@@ -27,7 +27,7 @@ namespace zypp
 
     IMPL_PTR_TYPE(SourceImpl);
 
-media::MediaManager media_mgr;
+    media::MediaManager media_mgr;
 
     ///////////////////////////////////////////////////////////////////
     //
@@ -45,31 +45,6 @@ media::MediaManager media_mgr;
     , _priority_unsubscribed (0)
     , _res_store_initialized(false)
     {
-      try {
-       Pathname media_file = "/media.1/media";
-
-       media_mgr.provideFile (_media, 1, media_file);
-       media_file = media_mgr.localPath(_media, media_file);
-
-#warning check the stream status
-       std::ifstream str(media_file.asString().c_str());
-       std::string media_vendor;
-       std::string media_id;
-       getline(str, media_vendor);
-       getline(str, media_id);
-
-       media_mgr.delVerifier(_media);
-       
-       MIL << "Adding proper media verifier" << endl;
-       
-       media_mgr.addVerifier(_media, media::MediaVerifierRef(new Verifier(media_vendor, media_id)));
-      }
-      catch (const Exception & excpt_r)
-      {
-#warning FIXME: If media data is not set, verifier is not set. Should the media be refused instead?
-       ZYPP_CAUGHT(excpt_r);
-       WAR << "Verifier not found" << endl;
-      }
     }
 
     ///////////////////////////////////////////////////////////////////

diff --git a/zypp/source/susetags/SuseTagsImpl.cc b/zypp/source/susetags/SuseTagsImpl.cc
index 2ad505f..6160d5b 100644 (file)
--- a/zypp/source/susetags/SuseTagsImpl.cc
+++ b/zypp/source/susetags/SuseTagsImpl.cc
@@ -42,6 +42,35 @@ namespace zypp
       //
       SuseTagsImpl::SuseTagsImpl( const Pathname & localDir_r )
       {
+
+       media::MediaManager media_mgr;
+
+        try {
+         Pathname media_file = "/media.1/media";
+
+         media_mgr.provideFile (_media, 1, media_file);
+         media_file = media_mgr.localPath(_media, media_file);
+
+#warning check the stream status
+         std::ifstream str(media_file.asString().c_str());
+         std::string media_vendor;
+         std::string media_id;
+         getline(str, media_vendor);
+         getline(str, media_id);
+
+         media_mgr.delVerifier(_media);
+       
+         MIL << "Adding proper media verifier" << endl;
+       
+         media_mgr.addVerifier(_media, media::MediaVerifierRef(new Verifier(media_vendor, media_id)));
+        }
+        catch (const Exception & excpt_r)
+        {
+#warning FIXME: If media data is not set, verifier is not set. Should the media be refused instead?
+         ZYPP_CAUGHT(excpt_r);
+         WAR << "Verifier not found" << endl;
+        }
+
         PathInfo p( localDir_r );
         if ( p.isDir() )
           p( localDir_r + "packages" );

diff --git a/zypp/source/yum/YUMSourceImpl.cc b/zypp/source/yum/YUMSourceImpl.cc
index 4812fc6..9f86974 100644 (file)
--- a/zypp/source/yum/YUMSourceImpl.cc
+++ b/zypp/source/yum/YUMSourceImpl.cc
@@ -52,7 +52,24 @@ namespace zypp
                                   const std::string & alias_r)
       : SourceImpl(media_r, path_r, alias_r)
       {
+        try {
+       
+         media::MediaManager media_mgr;
+
+         MIL << "Adding no media verifier" << endl;
+               
+         media_mgr.addVerifier(media_r, media::MediaVerifierRef(new media::NoVerifier()));
+        }
+        catch (const Exception & excpt_r)
+        {
+#warning FIXME: If media data is not set, verifier is not set. Should the media be refused instead?
+         ZYPP_CAUGHT(excpt_r);
+         WAR << "Verifier not found" << endl;
+        }
+       
        try {
+       
+        
        // first read list of all files in the repository
 
        // check only first