- Reverted workaround parsing /proc/sys/dev/cdrom/info as fallback

  to a HAL query to detect/verify CDROM drives. (#223376, #213194)

diff --git a/VERSION b/VERSION
index c9fd47a..02ee052 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -49,5 +49,5 @@ dnl ==================================================
 m4_define([LIBZYPP_MINOR],      [8])
 m4_define([LIBZYPP_COMPATMINOR], [8])
 dnl ==================================================
-m4_define([LIBZYPP_PATCH],      [7])
+m4_define([LIBZYPP_PATCH],      [6])
 dnl ==================================================

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 2cc945a..6bd21b1 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,12 +1,4 @@
 -------------------------------------------------------------------
-Thu Nov 23 14:50:48 CET 2006 - mt@suse.de
-
-- Applied a workaround parsing /proc/sys/dev/cdrom/info as fallback
-  to a HAL query to detect/verify CDROM drives. (#223376, #213194)
-- revision 4666
-- version 2.8.7
-
--------------------------------------------------------------------
 Wed Nov 22 19:24:57 CET 2006 - dmacvicar@suse.de
 
 - don't make libzypp-devel depend on sqlite-devel as

diff --git a/zypp/media/MediaCD.cc b/zypp/media/MediaCD.cc
index c007aed..346360b 100644 (file)
--- a/zypp/media/MediaCD.cc
+++ b/zypp/media/MediaCD.cc
@@ -12,7 +12,6 @@
 
 #include <iostream>
 
-#include "zypp/base/String.h"
 #include "zypp/base/Logger.h"
 #include "zypp/ExternalProgram.h"
 #include "zypp/media/Mount.h"
@@ -23,9 +22,6 @@
 
 #include <cstring> // strerror
 #include <cstdlib> // getenv
-#include <fstream>
-#include <vector>
-#include <list>
 
 #include <errno.h>
 #include <dirent.h>
@@ -73,15 +69,6 @@ namespace zypp {
 
     namespace {
 
-      struct drive_info
-      {
-        drive_info(const std::string &_name = std::string(), bool _dvdr = false)
-          : name(_name), dvdr(_dvdr)
-        {}
-        std::string name;
-        bool        dvdr;
-      };
-
       bool isNewDevice(const std::list<MediaSource> &devices,
                        const MediaSource            &media)
       {
@@ -399,79 +386,6 @@ namespace zypp {
       }
 
       //
-      // Read cdrom info from procfs as fallback ...
-      //
-      std::ifstream f( "/proc/sys/dev/cdrom/info");
-      if( f.is_open())
-      {
-       std::string line;
-       str::regex  rx_drive_name("^drive name:[ \t]+(.*)$");
-       str::regex  rx_dvd_support("^Can read DVD:[ \t]+(.*)$");
-       std::vector<drive_info> drives;
-
-       DBG << "Collecting CD-ROM device info from /proc filesystem" << std::endl;
-       while( std::getline(f, line))
-       {
-         str::smatch out;
-         if( regex_match(line, out, rx_drive_name) && out.size() == 2)
-         {
-           std::list<std::string>                 vals;
-           zypp::str::split(out[1].str(), std::back_inserter(vals), " \t");
-
-           drives.resize( vals.size());
-           std::list<std::string>::const_iterator v(vals.begin());
-           for(size_t n = 0; v != vals.end(); ++v, n++)
-           {
-              drives[n] = drive_info(*v);
-           }
-         }
-         else
-         if( regex_match(line, out, rx_dvd_support) && out.size() == 2)
-         {
-           std::list<std::string>                 vals;
-           zypp::str::split(out[1].str(), std::back_inserter(vals), " \t");
-           if( drives.size() == vals.size())
-           {
-             std::list<std::string>::const_iterator v(vals.begin());
-             for(size_t n = 0; v != vals.end(); ++v, n++)
-             {
-               drives[n].dvdr = (*v == "1");
-             }
-           }
-         }
-       }
-       f.close();
-       for(size_t i=0; i < drives.size(); i++)
-       {
-         if( drives[i].name.empty())
-           continue;
-
-         PathInfo dev_info("/dev/" + drives[i].name);
-         if( dev_info.isBlk())
-         {
-           MediaSource media("cdrom", dev_info.asString(),
-                                      dev_info.major(),
-                                      dev_info.minor());
-           if( isNewDevice(detected, media))
-           {
-             DBG << "Found a " << (drives[i].dvdr ? "DVD" : "CDROM")
-                 << " " << media.asString()
-                 << " info in /proc" << std::endl;
-             if( supportingDVD && drives[i].dvdr)
-             {
-               detected.push_front(media);
-             }
-             else
-             {
-               detected.push_back(media);
-             }
-           }
-         }
-       }
-      }
-
-
-      //
       // Bug #163971
       // Hal does not include SCSI / Virtual CDROMs on iSeries ...
       //