Attachment 183725 Details for Bug 341617

[patch] proposed patch for pkg-bindings

probe_fix.diff (text/plain), 1.64 KB, created by Ladislav Slezák on 2007-11-16 16:26:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ladislav Slezák

Created: 2007-11-16 16:26:47 UTC

Size: 1.64 KB

patch

obsolete

>Index: pkg-bindings/src/Source.cc
>===================================================================
>--- pkg-bindings/src/Source.cc	(revision 42118)
>+++ pkg-bindings/src/Source.cc	(working copy)
>@@ -1463,7 +1463,7 @@
> 		     const std::string &alias_r )
> {
>     // parse URL
>-    y2milestone ("Original URL: %s", url_r.asString().c_str());
>+    y2milestone ("Original URL: %s, product directory: %s", url_r.asString().c_str(), path_r.asString().c_str());
> 
>     // #158850#c17, if the URL contains an alias, we use that
>     zypp::Url url;
>@@ -1494,10 +1494,20 @@
>     // the type is not specified or is wrong, autoprobe the type 
>     if (repotype == zypp::repo::RepoType::NONE)
>     {
>-	y2milestone("Probing source type: '%s'", url.asString().c_str());
>+        zypp::Url probe_url(url_r);
> 
>+	if (!path_r.asString().empty())
>+	{
>+	    zypp::Pathname pth(probe_url.getPathName());
>+	    pth /= path_r;
>+
>+	    probe_url.setPathName(pth.asString());
>+	}
>+
>+	y2milestone("Probing source type: '%s'", probe_url.asString().c_str());
>+
> 	// autoprobe type of the repository 
>-	repotype = ProbeWithCallbacks(url);
>+	repotype = ProbeWithCallbacks(probe_url);
>     }
> 
>     y2milestone("Using source type: %s", repotype.asString().c_str());
>@@ -1591,7 +1601,7 @@
>     zypp::Pathname metadatapath = repomanager.metadataPath(repo);
>     repo.setMetadataPath(metadatapath);
> 
>-    y2milestone("Adding source '%s' (%s)", repo.alias().c_str(), url.asString().c_str());
>+    y2milestone("Adding source '%s' (%s, dir: %s)", repo.alias().c_str(), url.asString().c_str(), path_r.asString().c_str());
>     // note: exceptions should be caught by the calling code
>     RefreshWithCallbacks(repo);
>

Actions: View | Diff

Attachments on bug 341617: 183334 | 183675 | 183725