Mailinglist Archive: yast-commit (815 mails)

< Previous Next >
[yast-commit] r40000 - in /trunk/packager: package/yast2-packager.changes src/clients/inst_source.ycp
  • From: lslezak@xxxxxxxxxxxxxxxx
  • Date: Mon, 06 Aug 2007 13:09:32 -0000
  • Message-id: <20070806130932.382D2B5B01@xxxxxxxxxxxxxxxx>
Author: lslezak
Date: Mon Aug  6 15:09:31 2007
New Revision: 40000

URL: http://svn.opensuse.org/viewcvs/yast?rev=40000&view=rev
Log:
- fixed repository probing (merging URL and product directory has
  been moved to pkg-bindings)

Modified:
    trunk/packager/package/yast2-packager.changes
    trunk/packager/src/clients/inst_source.ycp

Modified: trunk/packager/package/yast2-packager.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=40000&r1=39999&r2=40000&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Mon Aug  6 15:09:31 2007
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Aug  6 15:06:37 CEST 2007 - lslezak@xxxxxxx
+
+- fixed repository probing (merging URL and product directory has
+  been moved to pkg-bindings)
+
+-------------------------------------------------------------------
 Mon Aug  6 09:39:01 CEST 2007 - locilka@xxxxxxx
 
 - Added text into the license-confirmation dialog about where to

Modified: trunk/packager/src/clients/inst_source.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_source.ycp?rev=40000&r1=39999&r2=40000&view=diff
==============================================================================
--- trunk/packager/src/clients/inst_source.ycp (original)
+++ trunk/packager/src/clients/inst_source.ycp Mon Aug  6 15:09:31 2007
@@ -212,24 +212,10 @@
                        name = preffered_name;
                    string prod_dir = repo[1]:"/";
 
-                   string prod_url = url;
-
-                   if (substring(prod_url, size(prod_url) - 1, 1) != "/")
-                   {
-                       prod_url = prod_url + "/";
-                   }
-
-                   if (substring(prod_dir, 0, 1) == "/")
-                   {
-                       prod_dir = substring(prod_dir, 1);
-                   }
-
-                   prod_url = prod_url + prod_dir;
-
                    // probe repository type (do not probe plaindir repo)
-                   string repo_type = (plaindir) ? plaindir_type : Pkg::RepositoryProbe(prod_url);
+                   string repo_type = (plaindir) ? plaindir_type : Pkg::RepositoryProbe(url, prod_dir);
 
-                   y2internal("Repository type (%1): %2", prod_url, repo_type);
+                   y2milestone("Repository type (%1,%2): %3", url, prod_dir, repo_type);
 
                    // the probing has failed
                    if (repo_type == nil || repo_type == "NONE")

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

< Previous Next >
This Thread
  • No further messages