Author: lslezak Date: Thu Apr 22 14:13:51 2010 New Revision: 61822 URL: http://svn.opensuse.org/viewcvs/yast?rev=61822&view=rev Log: - properly format installation URL when installing from ISO located at a SMB share (bnc#571648) - 2.19.6 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/InstURL.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=61822&r1=61821&r2=61822&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Thu Apr 22 14:13:51 2010 @@ -1 +1 @@ -2.19.5 +2.19.6 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=61822&r1=61821&r2=61822&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Apr 22 14:13:51 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 22 12:08:38 UTC 2010 - lslezak@suse.cz + +- properly format installation URL when installing from ISO + located at a SMB share (bnc#571648) +- 2.19.6 + +------------------------------------------------------------------- Mon Apr 19 07:27:40 UTC 2010 - lslezak@suse.cz - switch pkg manager to summary mode after resolving pkg conflicts Modified: trunk/packager/src/modules/InstURL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/InstURL.ycp?rev=61822&r1=61821&r2=61822&view=diff ============================================================================== --- trunk/packager/src/modules/InstURL.ycp (original) +++ trunk/packager/src/modules/InstURL.ycp Thu Apr 22 14:13:51 2010 @@ -299,7 +299,12 @@ { // FIXME don't know why it is needed // Needed as a seperator between URL and options (!) - url_tokens["path"] = "/"; + // bnc#571648 - smb installation source: linuxrc path failed for YaST repositories + if (instmode == "smb" && (share != nil) && (share != "")) { + url_tokens["path"] = share + "/"; + } else { + url_tokens["path"] = "/"; + } } string port = Linuxrc::InstallInf("Port"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org