Imported Upstream version 14.35.0

Change-Id: I6748648e8f440f55cbcb6efa5c9c6e15ac2a9f36
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd0c27a..47786d4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,7 +85,7 @@ MACRO(ADD_TESTS)
   FOREACH( loop_var ${ARGV} )
     SET_SOURCE_FILES_PROPERTIES( ${loop_var}_test.cc COMPILE_FLAGS "-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN -DBOOST_AUTO_TEST_MAIN=\"\" " )
     ADD_EXECUTABLE( ${loop_var}_test ${loop_var}_test.cc )
-    TARGET_LINK_LIBRARIES( ${loop_var}_test  zypp boost_unit_test_framework zypp_test_utils)
+    TARGET_LINK_LIBRARIES( ${loop_var}_test  zypp ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} zypp_test_utils)
     ADD_TEST( ${loop_var}_test ${CMAKE_CURRENT_BINARY_DIR}/${loop_var}_test --catch_system_errors=no)
   ENDFOREACH( loop_var )
 ENDMACRO(ADD_TESTS)
@@ -113,7 +113,7 @@ ELSE ( NOT RPM_FOUND)
   endif ( RPM_SUSPECT_VERSION STREQUAL "5.x" )
 ENDIF( NOT RPM_FOUND)
 
-FIND_PACKAGE(Boost REQUIRED COMPONENTS program_options unit_test_framework)
+FIND_PACKAGE(Boost REQUIRED COMPONENTS program_options thread unit_test_framework)
 IF (Boost_FOUND)
   MESSAGE( STATUS "boost found: includes in ${Boost_INCLUDE_DIRS}, library in ${Boost_LIBRARY_DIRS}")
   INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
@@ -128,19 +128,19 @@ ELSE (GETTEXT_FOUND)
   MESSAGE( FATAL_ERROR "Gettext not found" )
 ENDIF (GETTEXT_FOUND)
 
-FIND_PACKAGE(Curl REQUIRED)
+FIND_PACKAGE(CURL REQUIRED)
 IF ( NOT CURL_FOUND)
   MESSAGE( FATAL_ERROR " curl not found" )
 ELSE ( NOT CURL_FOUND)
-  INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIR})
+  INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
 ENDIF( NOT CURL_FOUND)
 
-FIND_PACKAGE(Libxml REQUIRED)
-IF ( NOT LIBXML_FOUND)
+FIND_PACKAGE(LibXml2 REQUIRED)
+IF ( NOT LIBXML2_FOUND)
   MESSAGE( FATAL_ERROR " libxml not found" )
-ELSE ( NOT LIBXML_FOUND)
-  INCLUDE_DIRECTORIES(${LIBXML_INCLUDE_DIR})
-ENDIF( NOT LIBXML_FOUND)
+ELSE ( NOT LIBXML2_FOUND)
+  INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+ENDIF( NOT LIBXML2_FOUND)
 
 FIND_PACKAGE(ZLIB REQUIRED)
 IF ( NOT ZLIB_FOUND)

diff --git a/VERSION.cmake b/VERSION.cmake
index c0599da..3820e38 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -60,9 +60,9 @@
 #
 SET(LIBZYPP_MAJOR "14")
 SET(LIBZYPP_COMPATMINOR "30")
-SET(LIBZYPP_MINOR "34")
+SET(LIBZYPP_MINOR "35")
 SET(LIBZYPP_PATCH "0")
 #
-# LAST RELEASED: 14.34.0 (30)
+# LAST RELEASED: 14.35.0 (30)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/cmake/modules/FindCurl.cmake b/cmake/modules/FindCurl.cmake
deleted file mode 100644 (file)
index 8576ddb..0000000
--- a/cmake/modules/FindCurl.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-
-if(CURL_INCLUDE_DIR AND CURL_LIBRARY)
-       # Already in cache, be silent
-       set(CURL_FIND_QUIETLY TRUE)     
-endif(CURL_INCLUDE_DIR AND CURL_LIBRARY)
-
-set(CURL_LIBRARY)
-set(CURL_INCLUDE_DIR)
-
-FIND_PATH(CURL_INCLUDE_DIR curl/curl.h
-       /usr/include
-       /usr/local/include
-)
-
-FIND_LIBRARY(CURL_LIBRARY NAMES curl
-       PATHS
-       /usr/lib
-       /usr/local/lib
-)
-
-if(CURL_INCLUDE_DIR AND CURL_LIBRARY)
-   MESSAGE( STATUS "curl found: includes in ${CURL_INCLUDE_DIR}, library in ${CURL_LIBRARY}")
-   set(CURL_FOUND TRUE)
-else(CURL_INCLUDE_DIR AND CURL_LIBRARY)
-   MESSAGE( STATUS "curl not found")
-endif(CURL_INCLUDE_DIR AND CURL_LIBRARY)
-
-MARK_AS_ADVANCED(CURL_INCLUDE_DIR CURL_LIBRARY)
\ No newline at end of file

diff --git a/cmake/modules/FindLibxml.cmake b/cmake/modules/FindLibxml.cmake
deleted file mode 100644 (file)
index cb2ae2a..0000000
--- a/cmake/modules/FindLibxml.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-
-if(LIBXML_INCLUDE_DIR AND LIBXML_LIBRARY)
-       # Already in cache, be silent
-       set(LIBXML_FIND_QUIETLY TRUE)   
-endif(LIBXML_INCLUDE_DIR AND LIBXML_LIBRARY)
-
-set(LIBXML_LIBRARY)
-set(LIBXML_INCLUDE_DIR)
-
-FIND_PATH(LIBXML_INCLUDE_DIR libxml/parser.h
-       /usr/include
-       /usr/include/libxml2
-       /usr/local/include
-)
-
-FIND_LIBRARY(LIBXML_LIBRARY NAMES xml2
-       PATHS
-       /usr/lib
-       /usr/local/lib
-)
-
-if(LIBXML_INCLUDE_DIR AND LIBXML_LIBRARY)
-   MESSAGE( STATUS "libxml found: includes in ${LIBXML_INCLUDE_DIR}, library in ${LIBXML_LIBRARY}")
-   set(LIBXML_FOUND TRUE)
-else(LIBXML_INCLUDE_DIR AND LIBXML_LIBRARY)
-   MESSAGE( STATUS "libxml not found")
-endif(LIBXML_INCLUDE_DIR AND LIBXML_LIBRARY)
-
-MARK_AS_ADVANCED(LIBXML_INCLUDE_DIR LIBXML_LIBRARY)
\ No newline at end of file

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 742c28b..cd3824e 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,21 @@
 -------------------------------------------------------------------
+Wed Jan 21 10:28:49 CET 2015 - ma@suse.de
+
+- PathInfo: Deprecate major/minor in favor of new devMajor/devMinor.
+  The old names clash with GNU libc macros.
+- version 14.35.0 (30)
+
+-------------------------------------------------------------------
+Sun Jan 18 01:13:09 CET 2015 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Jan 15 01:13:12 CET 2015 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
 Mon Jan 12 15:04:17 CET 2015 - ma@suse.de
 
 - Properly propagate repo variables in service refresh.

diff --git a/po/zypp-po.tar.bz2 b/po/zypp-po.tar.bz2
index be03706..07c62ea 100644 (file)
Binary files a/po/zypp-po.tar.bz2 and b/po/zypp-po.tar.bz2 differ

diff --git a/tests/lib/CMakeLists.txt b/tests/lib/CMakeLists.txt
index c794382..6b9b324 100644 (file)
--- a/tests/lib/CMakeLists.txt
+++ b/tests/lib/CMakeLists.txt
@@ -7,4 +7,4 @@ ADD_LIBRARY(zypp_test_utils
  WebServer.cc
 )
 
-TARGET_LINK_LIBRARIES(zypp_test_utils mongoose zypp boost_thread)
+TARGET_LINK_LIBRARIES(zypp_test_utils mongoose zypp ${Boost_THREAD_LIBRARY})

diff --git a/tests/repo/susetags/Downloader_test.cc b/tests/repo/susetags/Downloader_test.cc
index 3c39007..70fec59 100644 (file)
--- a/tests/repo/susetags/Downloader_test.cc
+++ b/tests/repo/susetags/Downloader_test.cc
@@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE(susetags_download)
     "/suse",
     "/suse/setup",
     "/suse/setup/descr",
-    "/suse/setup/descr/kde-10.3-71.i586.pat",
+    "/suse/setup/descr/kde-10.3-71.noarch.pat",
     "/suse/setup/descr/packages",
     "/suse/setup/descr/packages.DU",
     "/suse/setup/descr/packages.en",
@@ -102,7 +102,7 @@ BOOST_AUTO_TEST_CASE(susetags_gz_download)
     "/suse",
     "/suse/setup",
     "/suse/setup/descr",
-    "/suse/setup/descr/kde-10.3-71.i586.pat.gz",
+    "/suse/setup/descr/kde-10.3-71.noarch.pat.gz",
     "/suse/setup/descr/packages.gz",
     "/suse/setup/descr/packages.DU.gz",
     "/suse/setup/descr/packages.en.gz",

diff --git a/tests/repo/susetags/data/stable-x86-subset-gz/content b/tests/repo/susetags/data/stable-x86-subset-gz/content
index bf971f4..9bca45d 100644 (file)
--- a/tests/repo/susetags/data/stable-x86-subset-gz/content
+++ b/tests/repo/susetags/data/stable-x86-subset-gz/content
@@ -23,12 +23,12 @@ DESCRDIR suse/setup/descr
 DATADIR suse
 FLAGS update
 LANGUAGE en_US
-META SHA1 3b3a4b0f085dd3605b61cdec06783b6b2a1f1d61  kde-10.3-71.i586.pat.gz
+META SHA1 3b3a4b0f085dd3605b61cdec06783b6b2a1f1d61  kde-10.3-71.noarch.pat.gz
 META SHA1 2c351e103b347ef2984cb2aa638accfeadfaef58  packages.DU.gz
 META SHA1 208a6f8e1c96e9ba2ea7c74c05113c11c7378823  packages.en.gz
 META SHA1 59d65b8575ba1edde1813fef2e9949ae85f4d4c1  packages.es.gz
 META SHA1 061c361edf6157bc4273872055822e9d1766b8c4  packages.gz
-META SHA1 14373553814a3f83c2dce6c6da40740ae03b3065  patterns.gz
+META SHA1 8ae8446949182a9908c7d07b7bc58fb718cf3a92  patterns.gz
 KEY SHA1 c0354069c10819674da8706822e1d4bd0c1797e9  gpg-pubkey-0dfb3188-41ed929b.asc
 KEY SHA1 2e38e503c436c5d002bdc31755c82188044d9d21  gpg-pubkey-307e3d54-44201d5d.asc
 KEY SHA1 7025932e6866932f489421990075f3ed312023ea  gpg-pubkey-3d25d3d9-36e12d04.asc

diff --git a/tests/repo/susetags/data/stable-x86-subset-gz/content.asc b/tests/repo/susetags/data/stable-x86-subset-gz/content.asc
index 4e78ca9..63684d6 100644 (file)
Binary files a/tests/repo/susetags/data/stable-x86-subset-gz/content.asc and b/tests/repo/susetags/data/stable-x86-subset-gz/content.asc differ

diff --git a/tests/repo/susetags/data/stable-x86-subset-gz/content.key b/tests/repo/susetags/data/stable-x86-subset-gz/content.key
index fa39df7..661d0e2 100644 (file)
Binary files a/tests/repo/susetags/data/stable-x86-subset-gz/content.key and b/tests/repo/susetags/data/stable-x86-subset-gz/content.key differ

diff --git a/tests/repo/susetags/data/stable-x86-subset-gz/suse/setup/descr/kde-10.3-71.i586.pat.gz b/tests/repo/susetags/data/stable-x86-subset-gz/suse/setup/descr/kde-10.3-71.noarch.pat.gz
similarity index 100%
rename from tests/repo/susetags/data/stable-x86-subset-gz/suse/setup/descr/kde-10.3-71.i586.pat.gz
rename to tests/repo/susetags/data/stable-x86-subset-gz/suse/setup/descr/kde-10.3-71.noarch.pat.gz

diff --git a/tests/repo/susetags/data/stable-x86-subset-gz/suse/setup/descr/patterns.gz b/tests/repo/susetags/data/stable-x86-subset-gz/suse/setup/descr/patterns.gz
index e14fee1..62e0eb3 100644 (file)
Binary files a/tests/repo/susetags/data/stable-x86-subset-gz/suse/setup/descr/patterns.gz and b/tests/repo/susetags/data/stable-x86-subset-gz/suse/setup/descr/patterns.gz differ

diff --git a/tests/repo/susetags/data/stable-x86-subset/content b/tests/repo/susetags/data/stable-x86-subset/content
index 80efa99..215791f 100644 (file)
--- a/tests/repo/susetags/data/stable-x86-subset/content
+++ b/tests/repo/susetags/data/stable-x86-subset/content
@@ -23,12 +23,12 @@ DESCRDIR suse/setup/descr
 DATADIR suse
 FLAGS update
 LANGUAGE en_US
-META SHA1 c37f4ba4225650844363711710c3824a58c901dd  kde-10.3-71.i586.pat
+META SHA1 c37f4ba4225650844363711710c3824a58c901dd  kde-10.3-71.noarch.pat
 META SHA1 80f9bb1f9e95ebcebfd9b22f338f779e204cd50b  packages
 META SHA1 9c341d93124860f03b001681513ca07b4d0ca873  packages.DU
 META SHA1 a48fa507afccbce76b549a07394e41d9813e6b01  packages.en
 META SHA1 765900f5513ce6bf496d5006bdff45f805e61997  packages.es
-META SHA1 fbb6a2d6976c37c9a6beb52ca35f7594ae3eff1e  patterns
+META SHA1 d3c628ac67854629ff98432bebef6c00aad9bb98  patterns
 KEY SHA1 c0354069c10819674da8706822e1d4bd0c1797e9  gpg-pubkey-0dfb3188-41ed929b.asc
 KEY SHA1 2e38e503c436c5d002bdc31755c82188044d9d21  gpg-pubkey-307e3d54-44201d5d.asc
 KEY SHA1 7025932e6866932f489421990075f3ed312023ea  gpg-pubkey-3d25d3d9-36e12d04.asc

diff --git a/tests/repo/susetags/data/stable-x86-subset/content.asc b/tests/repo/susetags/data/stable-x86-subset/content.asc
index dd976ae..e02b8bb 100644 (file)
Binary files a/tests/repo/susetags/data/stable-x86-subset/content.asc and b/tests/repo/susetags/data/stable-x86-subset/content.asc differ

diff --git a/tests/repo/susetags/data/stable-x86-subset/content.key b/tests/repo/susetags/data/stable-x86-subset/content.key
index fa39df7..661d0e2 100644 (file)
Binary files a/tests/repo/susetags/data/stable-x86-subset/content.key and b/tests/repo/susetags/data/stable-x86-subset/content.key differ

diff --git a/tests/repo/susetags/data/stable-x86-subset/suse/setup/descr/kde-10.3-71.i586.pat b/tests/repo/susetags/data/stable-x86-subset/suse/setup/descr/kde-10.3-71.noarch.pat
similarity index 100%
rename from tests/repo/susetags/data/stable-x86-subset/suse/setup/descr/kde-10.3-71.i586.pat
rename to tests/repo/susetags/data/stable-x86-subset/suse/setup/descr/kde-10.3-71.noarch.pat

diff --git a/tests/repo/susetags/data/stable-x86-subset/suse/setup/descr/patterns b/tests/repo/susetags/data/stable-x86-subset/suse/setup/descr/patterns
index 82e92e9..43d428b 100644 (file)
--- a/tests/repo/susetags/data/stable-x86-subset/suse/setup/descr/patterns
+++ b/tests/repo/susetags/data/stable-x86-subset/suse/setup/descr/patterns
@@ -1,2 +1,2 @@
-kde-10.3-71.i586.pat
+kde-10.3-71.noarch.pat
 

diff --git a/tests/zypp/CpeId_test.cc b/tests/zypp/CpeId_test.cc
index 682a7f2..2322b49 100644 (file)
--- a/tests/zypp/CpeId_test.cc
+++ b/tests/zypp/CpeId_test.cc
@@ -160,7 +160,7 @@ BOOST_AUTO_TEST_CASE(cpeid_value_valid)
 {
   static const char *const hdig = "0123456789abcdef";
 
-  for ( char ch = 0x00; ch >= 0; ++ch )
+  for ( char ch = 0; ch < CHAR_MAX; ++ch )
   {
     // cout << "==== " << unsigned(ch) << endl;
     char qchstr[] = { '\\', ch, '\0' };

diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt
index 915628c..9bd803d 100644 (file)
--- a/zypp/CMakeLists.txt
+++ b/zypp/CMakeLists.txt
@@ -916,14 +916,13 @@ ADD_LIBRARY(zypp SHARED ${zypp_lib_SRCS})
 SET_TARGET_PROPERTIES( zypp PROPERTIES VERSION "${LIBZYPP_VERSION_INFO}" )
 SET_TARGET_PROPERTIES( zypp PROPERTIES SOVERSION "${LIBZYPP_SOVERSION_INFO}" )
 SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libzypp.map")
-ADD_DEPENDENCIES(zypp schema_header)
 # System libraries
 SET(UTIL_LIBRARY util)
 TARGET_LINK_LIBRARIES(zypp ${UTIL_LIBRARY} )
 TARGET_LINK_LIBRARIES(zypp ${RPM_LIBRARY} )
 TARGET_LINK_LIBRARIES(zypp ${GETTEXT_LIBRARIES} )
-TARGET_LINK_LIBRARIES(zypp ${CURL_LIBRARY} )
-TARGET_LINK_LIBRARIES(zypp ${LIBXML_LIBRARY} )
+TARGET_LINK_LIBRARIES(zypp ${CURL_LIBRARIES} )
+TARGET_LINK_LIBRARIES(zypp ${LIBXML2_LIBRARIES} )
 TARGET_LINK_LIBRARIES(zypp ${ZLIB_LIBRARY} )
 TARGET_LINK_LIBRARIES(zypp ${LibSolv_LIBRARIES} ${EXPAT_LIBRARY})
 TARGET_LINK_LIBRARIES(zypp ${OPENSSL_LIBRARIES} )

diff --git a/zypp/PathInfo.cc b/zypp/PathInfo.cc
index 4334c4e..08c1a10 100644 (file)
--- a/zypp/PathInfo.cc
+++ b/zypp/PathInfo.cc
@@ -236,24 +236,29 @@ namespace zypp
 
     /******************************************************************
      **
-     **        FUNCTION NAME : PathInfo::major
+     **        FUNCTION NAME : PathInfo::devMajor
      **        FUNCTION TYPE : unsigned int
      */
-    unsigned int PathInfo::major() const
+    unsigned int PathInfo::devMajor() const
     {
       return isBlk() || isChr() ? ::major(statbuf_C.st_rdev) : 0;
     }
 
     /******************************************************************
      **
-     **        FUNCTION NAME : PathInfo::minor
+     **        FUNCTION NAME : PathInfo::devMinor
      **        FUNCTION TYPE : unsigned int
      */
-    unsigned int PathInfo::minor() const
+    unsigned int PathInfo::devMinor() const
     {
       return isBlk() || isChr() ? ::minor(statbuf_C.st_rdev) : 0;
     }
 
+    unsigned int PathInfo::major() const
+    { INT << "Cleanup the code: This method is deprecated" << endl; return devMajor(); }
+    unsigned int PathInfo::minor() const
+    { INT << "Cleanup the code: This method is deprecated" << endl; return devMinor(); }
+
     /******************************************************************
      **
      **        FUNCTION NAME : operator<<

diff --git a/zypp/PathInfo.h b/zypp/PathInfo.h
index 4a59492..248614f 100644 (file)
--- a/zypp/PathInfo.h
+++ b/zypp/PathInfo.h
@@ -27,6 +27,7 @@ extern "C"
 #include <set>
 #include <map>
 
+#include "zypp/APIConfig.h"
 #include "zypp/Pathname.h"
 #include "zypp/CheckSum.h"
 #include "zypp/ByteCount.h"
@@ -359,8 +360,13 @@ namespace zypp
       dev_t  dev()     const { return isExist() ? statbuf_C.st_dev  : 0; }
       dev_t  rdev()    const { return isExist() ? statbuf_C.st_rdev : 0; }
 
-      unsigned int major() const;
-      unsigned int minor() const;
+      unsigned int devMajor() const;
+      unsigned int devMinor() const;
+
+      /** \deprecated Name clashes with GNU libc macro, use \ref devMajor instead. */
+      unsigned int major() const ZYPP_DEPRECATED;
+      /** \deprecated Name clashes with GNU libc macro, use \ref devMinor instead. */
+      unsigned int minor() const ZYPP_DEPRECATED;
       //@}
 
       /** \name Size info. */

diff --git a/zypp/VendorAttr.cc b/zypp/VendorAttr.cc
index 034841a..2cef434 100644 (file)
--- a/zypp/VendorAttr.cc
+++ b/zypp/VendorAttr.cc
@@ -253,14 +253,7 @@ namespace zypp
 
   bool VendorAttr::addVendorDirectory( const Pathname & dirname ) const
   {
-      parser::IniDict dict;
-
-      if ( PathInfo(dirname).isExist())
-      {
-          InputStream is(dirname);
-          dict.read(is);
-      }
-      else
+      if ( ! PathInfo(dirname).isExist() )
       {
           MIL << dirname << " not found." << endl;
           return false;

diff --git a/zypp/media/MediaCD.cc b/zypp/media/MediaCD.cc
index 172ea3e..03f2be9 100644 (file)
--- a/zypp/media/MediaCD.cc
+++ b/zypp/media/MediaCD.cc
@@ -127,7 +127,7 @@ namespace zypp
          PathInfo devnode( devnodePtr );
          if ( devnode.isBlk() )
          {
-           MediaSource media( "cdrom", devnode.path().asString(), devnode.major(), devnode.minor() );
+           MediaSource media( "cdrom", devnode.path().asString(), devnode.devMajor(), devnode.devMinor() );
            DBG << "Found (udev): " << media << std::endl;
            detected.push_back( media );
          }
@@ -335,14 +335,14 @@ namespace zypp
       PathInfo cdrinfo( "/dev/cdrom" );
       if ( dvdinfo.isBlk() )
       {
-       MediaSource media( "cdrom", dvdinfo.path().asString(), dvdinfo.major(), dvdinfo.minor() );
+       MediaSource media( "cdrom", dvdinfo.path().asString(), dvdinfo.devMajor(), dvdinfo.devMinor() );
        DBG << "Found (GUESS): " << media << std::endl;
        detected.push_back( media );
       }
       if ( cdrinfo.isBlk()
-       && ! ( cdrinfo.major() == dvdinfo.major() && cdrinfo.minor() == dvdinfo.minor() ) )
+       && ! ( cdrinfo.devMajor() == dvdinfo.devMajor() && cdrinfo.devMinor() == dvdinfo.devMinor() ) )
       {
-       MediaSource media( "cdrom", cdrinfo.path().asString(), cdrinfo.major(), cdrinfo.minor() );
+       MediaSource media( "cdrom", cdrinfo.path().asString(), cdrinfo.devMajor(), cdrinfo.devMinor() );
        DBG << "Found (GUESS): " << media << std::endl;
        detected.push_back( media );
       }
@@ -364,7 +364,7 @@ namespace zypp
       PathInfo dinfo( device );
       if ( dinfo.isBlk() )
       {
-       MediaSource media( "cdrom", device, dinfo.major(), dinfo.minor() );
+       MediaSource media( "cdrom", device, dinfo.devMajor(), dinfo.devMinor() );
        if ( detected.empty() )
        {
          _devices.push_front( media ); // better try this than nothing
@@ -453,8 +453,8 @@ namespace zypp
       }
       DBG << "trying device " << dinfo << endl;
 
-      temp.maj_nr = dinfo.major();
-      temp.min_nr = dinfo.minor();
+      temp.maj_nr = dinfo.devMajor();
+      temp.min_nr = dinfo.devMinor();
       MediaSourceRef media( new MediaSource(temp));
       AttachedMedia ret( findAttachedMedia( media));
 
@@ -490,8 +490,8 @@ namespace zypp
             is_device = true;
           }
 
-          if( is_device && media->maj_nr == dev_info.major() &&
-                           media->min_nr == dev_info.minor())
+          if( is_device && media->maj_nr == dev_info.devMajor() &&
+                           media->min_nr == dev_info.devMinor())
           {
             AttachPointRef ap( new AttachPoint(e->dir, false));
             AttachedMedia  am( media, ap);
@@ -657,7 +657,9 @@ namespace zypp
   //
   void MediaCD::forceEject( const std::string & ejectDev_r )
   {
+#if REPORT_EJECT_ERRORS
     bool ejected = false;
+#endif
     if ( ! isAttached() )      // no device mounted in this instance
     {
       // This also fills the _devices list on demand
@@ -686,7 +688,9 @@ namespace zypp
           forceRelaseAllMedia( media, false );
           if ( openTray( it->name ) )
           {
+#if REPORT_EJECT_ERRORS
             ejected = true;
+#endif
             break; // on 1st success
           }
         }

diff --git a/zypp/media/MediaDISK.cc b/zypp/media/MediaDISK.cc
index eac00d5..de4f244 100644 (file)
--- a/zypp/media/MediaDISK.cc
+++ b/zypp/media/MediaDISK.cc
@@ -114,8 +114,8 @@ namespace zypp {
          for(it = dlist.begin(); it != dlist.end(); ++it)
          {
            PathInfo vol_info(*it);
-           if( vol_info.isBlk() && vol_info.major() == dev_info.major() &&
-                                   vol_info.minor() == dev_info.minor())
+           if( vol_info.isBlk() && vol_info.devMajor() == dev_info.devMajor() &&
+                                   vol_info.devMinor() == dev_info.devMinor())
            {
              DBG << "Specified device name " << dev_name
                  << " is a volume (disk/by-uuid link "
@@ -138,8 +138,8 @@ namespace zypp {
          for(it = dlist.begin(); it != dlist.end(); ++it)
          {
            PathInfo vol_info(*it);
-           if( vol_info.isBlk() && vol_info.major() == dev_info.major() &&
-                                   vol_info.minor() == dev_info.minor())
+           if( vol_info.isBlk() && vol_info.devMajor() == dev_info.devMajor() &&
+                                   vol_info.devMinor() == dev_info.devMinor())
            {
              DBG << "Specified device name " << dev_name
                  << " is a volume (disk/by-label link "
@@ -207,7 +207,7 @@ namespace zypp {
        ZYPP_THROW(MediaBadUrlEmptyFilesystemException(url()));
 
       MediaSourceRef media( new MediaSource(
-       "disk", _device, dev_info.major(), dev_info.minor()
+       "disk", _device, dev_info.devMajor(), dev_info.devMinor()
       ));
       AttachedMedia  ret( findAttachedMedia( media));
 
@@ -242,8 +242,8 @@ namespace zypp {
          is_device = true;
        }
 
-       if( is_device && media->maj_nr == dev_info.major() &&
-                        media->min_nr == dev_info.minor())
+       if( is_device && media->maj_nr == dev_info.devMajor() &&
+                        media->min_nr == dev_info.devMinor())
        {
          AttachPointRef ap( new AttachPoint(e->dir, false));
          AttachedMedia  am( media, ap);

diff --git a/zypp/media/MediaHandler.cc b/zypp/media/MediaHandler.cc
index 566f5dc..18c05fe 100644 (file)
--- a/zypp/media/MediaHandler.cc
+++ b/zypp/media/MediaHandler.cc
@@ -544,7 +544,7 @@ MediaHandler::checkAttached(bool matchMountFs) const
                           ref.mediaSource->bdir.empty()))
         {
           std::string mtype(matchMountFs ? e->type : ref.mediaSource->type);
-          MediaSource media(mtype, e->src, dev_info.major(), dev_info.minor());
+          MediaSource media(mtype, e->src, dev_info.devMajor(), dev_info.devMinor());
 
           if( ref.mediaSource->equals( media ) )
           {
@@ -822,7 +822,7 @@ void MediaHandler::forceRelaseAllMedia(const MediaSourceRef &ref,
     if( is_device &&  ref->maj_nr)
     {
       std::string mtype(matchMountFs ? e->type : ref->type);
-      MediaSource media(mtype, e->src, dev_info.major(), dev_info.minor());
+      MediaSource media(mtype, e->src, dev_info.devMajor(), dev_info.devMinor());
 
       if( ref->equals( media) && e->type != "subfs")
       {

diff --git a/zypp/media/MediaISO.cc b/zypp/media/MediaISO.cc
index 9accb70..83bd5cf 100644 (file)
--- a/zypp/media/MediaISO.cc
+++ b/zypp/media/MediaISO.cc
@@ -222,8 +222,8 @@ namespace zypp
       PathInfo dinfo(loopdev);
       if( dinfo.isBlk())
       {
-        media->maj_nr = dinfo.major();
-        media->min_nr = dinfo.minor();
+        media->maj_nr = dinfo.devMajor();
+        media->min_nr = dinfo.devMinor();
       }
       else
         ERR << loopdev << " is not a block device" << endl;