Fixed Pkg.ExpandedUrl to return also the password (bsc#1067007)

- 3.2.5
yast · Dec 8, 2017 · b9eaa2c · b9eaa2c
1 parent eae9181
commit b9eaa2c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/package/yast2-pkg-bindings-devel-doc.spec b/package/yast2-pkg-bindings-devel-doc.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-pkg-bindings-devel-doc
-Version:        3.2.4
+Version:        3.2.5
 Release:        0
 License:        GPL-2.0
 Group:          Documentation/HTML

diff --git a/package/yast2-pkg-bindings.changes b/package/yast2-pkg-bindings.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Dec  7 12:03:48 UTC 2017 - lslezak@suse.cz
+
+- Fixed Pkg.ExpandedUrl to return also the password part
+  of the URL (bsc#1067007)
+- 3.2.5
+
 -------------------------------------------------------------------
 Wed Jun 21 12:16:39 UTC 2017 - lslezak@suse.cz
 

diff --git a/package/yast2-pkg-bindings.spec b/package/yast2-pkg-bindings.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-pkg-bindings
-Version:        3.2.4
+Version:        3.2.5
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/PkgFunctions.cc b/src/PkgFunctions.cc
@@ -517,5 +517,6 @@ YCPValue PkgFunctions::ExpandedUrl(const YCPString &url)
 
     zypp::RepoVariablesReplacedUrl replacedUrl;
     replacedUrl.raw() = zypp::Url(url->asString()->value());
-    return YCPString(replacedUrl.transformed().asString());
+    // return full URL including the password if present
+    return YCPString(replacedUrl.transformed().asCompleteString());
 }