fixed media handling in SuSEtags source (#164879)

diff --git a/package/libzypp.changes b/package/libzypp.changes
index ba46b20..960b570 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Apr 10 17:00:05 CEST 2006 - jsrain@suse.de
+
+- fixed media handling in SuSEtags source (#164879)
+- rev 3037
+
+-------------------------------------------------------------------
 Mon Apr 10 16:30:54 CEST 2006 - kkaempf@suse.de
 
 - honor 'dry_run' on package remove (#164732)

diff --git a/zypp/source/susetags/SuseTagsImpl.cc b/zypp/source/susetags/SuseTagsImpl.cc
index 7033443..f762ada 100644 (file)
--- a/zypp/source/susetags/SuseTagsImpl.cc
+++ b/zypp/source/susetags/SuseTagsImpl.cc
@@ -73,8 +73,6 @@ namespace zypp
         initCacheDir(cache_dir_r);
         //suse/setup/descr
         //packages.* *.sel
-        media::MediaManager media_mgr;
-        media::MediaAccessId media_num = _media_set->getMediaAccessId(1);
         
         INT << "Storing data to cache " << cache_dir_r << endl;
         
@@ -90,7 +88,7 @@ namespace zypp
         
         // get the list of cache keys
         std::list<std::string> files;
-        dirInfo( media_num, files, _path);
+        dirInfo( 1, files, _path);
                 
         if (0 != assert_dir((cache_dir_r + "DATA"), 0700))
         {
@@ -276,9 +274,7 @@ namespace zypp
         else
         {
           std::list<std::string> allfiles;
-          media::MediaManager media_mgr;
-          media::MediaAccessId media_num = _media_set->getMediaAccessId(1);
-          dirInfo(media_num, allfiles, _path);
+          dirInfo(1, allfiles, _path);
 
           for( std::list<std::string>::const_iterator it = allfiles.begin(); it != allfiles.end(); ++it)
           {
@@ -366,12 +362,9 @@ namespace zypp
           _content_file = provideFile(_path + "content");
           
           // we need to read the dir to see if content.key and .asc exists
-          media::MediaManager media_mgr;
-          media::MediaAccessId media_num = _media_set->getMediaAccessId(1);
-          
           // get the list of cache keys
           std::list<std::string> files;
-          dirInfo( media_num, files, _path);
+          dirInfo( 1, files, _path);
           
           for( std::list<std::string>::const_iterator it = files.begin(); it != files.end(); ++it)
           {