Merge pull request #2686 from SebDieBln/FixPostgresWarnings

[Postgres] Remove the temporary SSL files only when they were created
qgis · Jan 17, 2016 · 6435a20 · 6435a20 · luipir · Jan 17, 2016
2 parents f966c42 + ed80951
commit 6435a20
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
@@ -208,19 +208,19 @@ QgsPostgresConn::QgsPostgresConn( const QString& conninfo, bool readOnly, bool s
 
   mConn = PQconnectdb( expandedConnectionInfo.toLocal8Bit() );  // use what is set based on locale; after connecting, use Utf8
 
-  // remove temporary cert/key/CA
+  // remove temporary cert/key/CA if they exist
   QgsDataSourceURI expandedUri( expandedConnectionInfo );
-  QString sslCertFile = expandedUri.param( "sslcert" );
-  sslCertFile.remove( "'" );
-  QFile::remove( sslCertFile );
-
-  QString sslKeyFile = expandedUri.param( "sslkey" );
-  sslKeyFile.remove( "'" );
-  QFile::remove( sslKeyFile );
-
-  QString sslCAFile = expandedUri.param( "sslrootcert" );
-  sslCAFile.remove( "'" );
-  QFile::remove( sslCAFile );
+  QStringList parameters;
+  parameters << "sslcert" << "sslkey" << "sslrootcert";
+  Q_FOREACH ( const QString& param, parameters )
+  {
+    if ( expandedUri.hasParam( param ) )
+    {
+      QString fileName = expandedUri.param( param );
+      fileName.remove( "'" );
+      QFile::remove( fileName );
+    }
+  }
 
   // check the connection status
   if ( PQstatus() != CONNECTION_OK )