Author: jkupec
Date: Mon Jun 4 14:21:34 2007
New Revision: 5662
URL: http://svn.opensuse.org/viewcvs/zypp?rev=5662&view=rev
Log:
Renamed _path to _prefAttachPoint to avoid confusion.
If we will not want the mount point hint in MediaSetAccess API, we'll
remove it then.
Modified:
trunk/libzypp/zypp/MediaSetAccess.cc
trunk/libzypp/zypp/MediaSetAccess.h
Modified: trunk/libzypp/zypp/MediaSetAccess.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/MediaSetAccess.cc?rev=5662&r1=5661&r2=5662&view=diff
==============================================================================
--- trunk/libzypp/zypp/MediaSetAccess.cc (original)
+++ trunk/libzypp/zypp/MediaSetAccess.cc Mon Jun 4 14:21:34 2007
@@ -23,9 +23,10 @@
{ /////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
- MediaSetAccess::MediaSetAccess( const Url &url, const Pathname &path )
+ MediaSetAccess::MediaSetAccess(const Url &url,
+ const Pathname & prefered_attach_point)
: _url(url),
- _path(path)
+ _prefAttachPoint(prefered_attach_point)
{
MIL << "initializing.." << std::endl;
//std::vectormedia::MediaVerifierRef single_media;
@@ -319,7 +320,7 @@
}
Url url;
url = rewriteUrl (_url, medianr);
- media::MediaAccessId id = media_mgr.open(url, _path);
+ media::MediaAccessId id = media_mgr.open(url, _prefAttachPoint);
_medias[medianr] = id;
try
@@ -391,7 +392,7 @@
std::ostream & MediaSetAccess::dumpOn( std::ostream & str ) const
{
- str << "MediaSetAccess (URL='" << _url << "', path='" << _path << "')";
+ str << "MediaSetAccess (URL='" << _url << "', attach_point_hint='" << _prefAttachPoint << "')";
return str;
}
Modified: trunk/libzypp/zypp/MediaSetAccess.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/MediaSetAccess.h?rev=5662&r1=5661&r2=5662&view=diff
==============================================================================
--- trunk/libzypp/zypp/MediaSetAccess.h (original)
+++ trunk/libzypp/zypp/MediaSetAccess.h Mon Jun 4 14:21:34 2007
@@ -82,9 +82,10 @@
* Creates a callback enabled media access for specified \a url.
*
* \param url
- * \param path Prefered attach (mount) point.
+ * \param prefered_attach_point Prefered attach (mount) point. Use, if
+ * you want to mount the media to a specific directory.
*/
- MediaSetAccess(const Url &url, const Pathname &path = "");
+ MediaSetAccess(const Url &url, const Pathname & prefered_attach_point = "");
~MediaSetAccess();
/**
@@ -134,12 +135,14 @@
private:
/** Media or media set URL */
Url _url;
+
/**
* Prefered mount point.
*
- * \see MediaManager::open(Url,Pathname) MediaHandler::_attachPoint
+ * \see MediaManager::open(Url,Pathname)
+ * \see MediaHandler::_attachPoint
*/
- Pathname _path;
+ Pathname _prefAttachPoint;
typedef std::map