Attachment 61574 Details for Bug 140317

[patch] patch to correct url-escaping

yast2-packagemanager-2.13.13-escapeURL.diff (text/plain), 2.17 KB, created by Juergen Weigert on 2005-12-21 18:28:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Juergen Weigert

Created: 2005-12-21 18:28:31 UTC

Size: 2.17 KB

patch

obsolete

>--- yast2-packagemanager-2.13.13/src/you/PMYouServers.cc.orig	2005-12-21 19:12:42.000000000 +0100
>+++ yast2-packagemanager-2.13.13/src/you/PMYouServers.cc	2005-12-21 19:12:06.000000000 +0100
>@@ -354,12 +354,12 @@
>     if ( product )
>     {
> 	url = product->youUrl();
>-	url += "?product=" + product->product();
>-	url += "&version=" + product->version();
>-	url += "&basearch=" + string( product->baseArch() );
>-	url += "&arch=" + string( product->arch() );
>+	url += "?product=" + encodeUrl( product->product() );
>+	url += "&version=" + encodeUrl( product->version() );
>+	url += "&basearch=" + encodeUrl(string( product->baseArch() ) );
>+	url += "&arch=" + encodeUrl( string( product->arch() ) ) ;
> 
>-	url += "&lang=" + string( _settings->langCode().code() );
>+	url += "&lang=" + encodeUrl( string( _settings->langCode().code() ) );
> 
> 	url += "&business=";
> 	if ( product->businessProduct() ) url += "1";
>@@ -369,7 +369,7 @@
> 	if ( check ) url += "1";
> 	else url += "0";
> 
>-	url += "&distproduct=" + product->distProduct();
>+	url += "&distproduct=" + encodeUrl( product->distProduct() );
>     }
> 
> 
>@@ -381,7 +381,7 @@
>     if (suse_release) {
> 	string release_line = stringutil::getline (suse_release, true);
> 	if (release_line.size() > 0) {
>-	    url += "&suse-release=" + release_line;
>+	    url += "&suse-release=" + encodeUrl(release_line);
> 	}
>     }
>     }	// end of scope for suse_release, close stream
>@@ -392,16 +392,14 @@
> 
>     SysConfig clock( "clock" );
>     string timezone = clock.readEntry( "TIMEZONE" );
>-    url += "&timezone=" + timezone;
>+    url += "&timezone=" + encodeUrl( timezone );
> 
>     SysConfig youcfg( "onlineupdate" );
>     if (youcfg.readBoolEntry("YOU_USE_MACHID", true))
>       {
>-        url += "&machid=" + fetchMachID();
>+        url += "&machid=" + encodeUrl( fetchMachID() );
>       }
> 
>-    url = encodeUrl( url );
>-
>     DBG << "url: '" << url << "'" << endl;
> 
>     Pathname writeDir = _settings->localWriteDir();
>@@ -550,7 +548,7 @@
>     if ( !pkg ) {
>       WAR << "No installed object for " << pkgName << endl;
>     } else {
>-      url += "&" + pkgName + "=" + pkg->edition().asString();
>+      url += "&" + pkgName + "=" + encodeUrl( pkg->edition().asString() );
>     }
>   }
> }

Actions: View | Diff

Attachments on bug 140317: 61574