Author: jkupec
Date: Thu Apr 12 13:28:34 2007
New Revision: 5354
URL: http://svn.opensuse.org/viewcvs/zypp?rev=5354&view=rev
Log:
made the path parameter default to "" in MediaSetAccess(Url, Pathname)
Modified:
trunk/libzypp/tests/zypp/MediaSetAccessTest.cc
trunk/libzypp/zypp/MediaSetAccess.h
Modified: trunk/libzypp/tests/zypp/MediaSetAccessTest.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/MediaSetAccessTest.cc?rev=5354&r1=5353&r2=5354&view=diff
==============================================================================
--- trunk/libzypp/tests/zypp/MediaSetAccessTest.cc (original)
+++ trunk/libzypp/tests/zypp/MediaSetAccessTest.cc Thu Apr 12 13:28:34 2007
@@ -94,9 +94,10 @@
/*
* Provide files from set without verifiers.
*/
-void msa_provide_files_set(const string &url)
+void msa_provide_files_set(const string &urlstr)
{
- MediaSetAccess setaccess(Url(url), "/");
+ Url url(urlstr);
+ MediaSetAccess setaccess(url);
Pathname file1 = setaccess.provideFile("/test.txt", 1);
BOOST_CHECK(check_file_exists(file1) == true);
@@ -111,9 +112,10 @@
/*
* Provide files from set with verifiers.
*/
-void msa_provide_files_set_verified(const string &url)
+void msa_provide_files_set_verified(const string &urlstr)
{
- MediaSetAccess setaccess(Url(url), "/");
+ Url url(urlstr);
+ MediaSetAccess setaccess(url);
setaccess.setVerifier(1, media::MediaVerifierRef(new SimpleVerifier("media1")));
setaccess.setVerifier(2, media::MediaVerifierRef(new SimpleVerifier("media2")));
@@ -135,9 +137,10 @@
/*
* Provide file from single media with verifier.
*/
-void msa_provide_files_single(const string &url)
+void msa_provide_files_single(const string &urlstr)
{
- MediaSetAccess setaccess(Url(url), "/");
+ Url url(urlstr);
+ MediaSetAccess setaccess(url);
setaccess.setVerifier(1, media::MediaVerifierRef(new SimpleVerifier("media")));
// provide file from media
Modified: trunk/libzypp/zypp/MediaSetAccess.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/MediaSetAccess.h?rev=5354&r1=5353&r2=5354&view=diff
==============================================================================
--- trunk/libzypp/zypp/MediaSetAccess.h (original)
+++ trunk/libzypp/zypp/MediaSetAccess.h Thu Apr 12 13:28:34 2007
@@ -78,7 +78,7 @@
* \code
* Url url("dir:/path/to/cdset/sources/openSUSE-10.3/Alpha2plus/CD1");
*
- * MediaSetAccess access(url, "/");
+ * MediaSetAccess access(url);
*
* access.setVerifier(1, media1VerifierRef);
* access.setVerifier(2, media2VerifierRef);
@@ -96,9 +96,12 @@
public:
/**
- * Creates a callback enabled media access for \a url and \a path.
+ * Creates a callback enabled media access for specified \a url.
+ *
+ * \param url
+ * \param path Prefered attach (mount) point.
*/
- MediaSetAccess( const Url &url, const Pathname &path );
+ MediaSetAccess(const Url &url, const Pathname &path = "");
~MediaSetAccess();
/**
@@ -148,7 +151,11 @@
private:
/** Media or media set URL */
Url _url;
- /** Path on the media relative to _url */
+ /**
+ * Prefered mount point.
+ *
+ * \see MediaManager::open(Url,Pathname) MediaHandler::_attachPoint
+ */
Pathname _path;
typedef std::map