- Removed MediaNr from isDesiredMedia() in verifiers.

diff --git a/zypp/SourceFactory.cc b/zypp/SourceFactory.cc
index e07a763..17c3aed 100644 (file)
--- a/zypp/SourceFactory.cc
+++ b/zypp/SourceFactory.cc
@@ -96,7 +96,7 @@ media::MediaManager media_mgr;
     media::MediaId id = media_mgr.open(url_r);
     media_mgr.attach(id);
     Pathname products_file = Pathname("media.1/products");
-    media_mgr.provideFile (id, 1, products_file);
+    media_mgr.provideFile (id, products_file);
     products_file = media_mgr.localPath (id, products_file);
     scanProductsFile (products_file, products_r);
     media_mgr.release(id);

diff --git a/zypp/source/SourceImpl.cc b/zypp/source/SourceImpl.cc
index f9fa233..0e1058c 100644 (file)
--- a/zypp/source/SourceImpl.cc
+++ b/zypp/source/SourceImpl.cc
@@ -240,8 +240,9 @@ namespace zypp
     , _media_id(id_r)
     {}
 
-    bool SourceImpl::Verifier::isDesiredMedia(const media::MediaAccessRef &ref, media::MediaNr mediaNr)
+    bool SourceImpl::Verifier::isDesiredMedia(const media::MediaAccessRef &ref)
     {
+      media::MediaNr mediaNr = 1; // FIXME!!
       if (_media_vendor.empty() || _media_id.empty())
        return true;
 #warning TODO define what does missing media_id/media_vendor mean

diff --git a/zypp/source/SourceImpl.h b/zypp/source/SourceImpl.h
index c6ffc2c..6dc4d00 100644 (file)
--- a/zypp/source/SourceImpl.h
+++ b/zypp/source/SourceImpl.h
@@ -244,7 +244,7 @@ namespace zypp
         ** the desired media number (e.g. SLES10 CD1).
         */
        virtual bool
-       isDesiredMedia(const media::MediaAccessRef &ref, media::MediaNr mediaNr);
+       isDesiredMedia(const media::MediaAccessRef &ref);
 
       private:
        std::string _media_vendor;