Mailinglist Archive: yast-commit (815 mails)

< Previous Next >
[yast-commit] r39903 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Source.cc
  • From: lslezak@xxxxxxxxxxxxxxxx
  • Date: Thu, 02 Aug 2007 13:06:06 -0000
  • Message-id: <20070802130606.E13B1B58CE@xxxxxxxxxxxxxxxx>
Author: lslezak
Date: Thu Aug  2 15:06:06 2007
New Revision: 39903

URL: http://svn.opensuse.org/viewcvs/yast?rev=39903&view=rev
Log:
- added product directory support

Modified:
    trunk/pkg-bindings/package/yast2-pkg-bindings.changes
    trunk/pkg-bindings/src/Source.cc

Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-bindings.changes?rev=39903&r1=39902&r2=39903&view=diff
==============================================================================
--- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original)
+++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Thu Aug  2 15:06:06 2007
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Thu Aug  2 15:05:39 CEST 2007 - lslezak@xxxxxxx
+
+- added product directory support
+
+-------------------------------------------------------------------
 Thu Aug  2 09:56:21 CEST 2007 - lslezak@xxxxxxx
 
 - added Pkg::CallbackInitDownload() and Pkg::CallbackDestDownload()

Modified: trunk/pkg-bindings/src/Source.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source.cc?rev=39903&r1=39902&r2=39903&view=diff
==============================================================================
--- trunk/pkg-bindings/src/Source.cc (original)
+++ trunk/pkg-bindings/src/Source.cc Thu Aug  2 15:06:06 2007
@@ -790,9 +790,7 @@
     data->add( YCPString("enabled"),              YCPBoolean(repo->repoInfo().enabled()));
     data->add( YCPString("autorefresh"),  YCPBoolean(repo->repoInfo().autorefresh()));
     data->add( YCPString("type"),         YCPString(srctype));
-#warning FIXME: "product_dir" is always "/"
-//    data->add( YCPString("product_dir"),        YCPString(repo->path().asString()));
-    data->add( YCPString("product_dir"),  YCPString("/"));
+    data->add( YCPString("product_dir"),  YCPString(repo->repoInfo().path().asString()));
     
     // check if there is an URL
     if (repo->repoInfo().baseUrlsBegin() != repo->repoInfo().baseUrlsEnd())
@@ -1365,18 +1363,7 @@
     std::string alias = removeAlias(url_r, url);
     y2milestone("Alias from URL: '%s'", alias.c_str());
 
-#warning FIXME: use base_source (base_source vs. addon)
-#warning FIXME: use path_r (product directory)
-/*
-    FIXME: add the product dir to the URL?
-    std::string prod_dir = path_r.asString();
-    if (!prod_dir.empty() && prod_dir != "/")
-    {
-       y2milestone("Using product directory: %s", prod_dir.c_str());
-       std::string path = url.getPathName();
-       path = path + "/"
-    }
-*/
+#warning FIXME: use base_source (base_source vs. addon) (will be probably not needed)
 
     // repository type
     zypp::repo::RepoType repotype;
@@ -1432,6 +1419,7 @@
     repo.setName(name);
     repo.setType(repotype);
     repo.addBaseUrl(url);
+    repo.setPath(path_r);
     repo.setEnabled(true);
     repo.setAutorefresh(true);
 
@@ -1602,7 +1590,7 @@
 
     if (!params->value( YCPString("prod_dir") ).isNull() && params->value(YCPString("prod_dir"))->isString())
     {
-       #warning FIXME TODO: add product directory support
+       repo.setPath(params->value(YCPString("prod_dir"))->asString()->value());
     }
 
     repos.push_back(new YRepo(repo));

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages