[qgis] 05/13: Add patch to not look for topology layers without topology support.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository qgis.

commit 67961520e930161e171025165775efd2147b6861
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 8 05:46:54 2014 +0100

    Add patch to not look for topology layers without topology support.
---
 debian/changelog                                        |  1 +
 debian/patches/postgres-provider-topology-support.patch | 15 +++++++++++++++
 debian/patches/series                                   |  1 +
 3 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 94be5d4..f9c8abc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ qgis (2.0.1-2) UNRELEASED; urgency=low
   [ Bas Couwenberg ]
   * Additional checks in qgis-providers-common.postinst 
   * Add patch to fix mis-detection of PostGIS table types.
+  * Add patch to not look for topology layers without topology support.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 31 Jan 2014 19:42:03 +0100
 
diff --git a/debian/patches/postgres-provider-topology-support.patch b/debian/patches/postgres-provider-topology-support.patch
new file mode 100644
index 0000000..001b6d9
--- /dev/null
+++ b/debian/patches/postgres-provider-topology-support.patch
@@ -0,0 +1,15 @@
+From: "Juergen E. Fischer" <jef at norbit.de>
+Subject: postgres provider: don't look for topology layers without topology support
+Origin: https://github.com/qgis/QGIS/commit/673406d271fbc54071c3cc8835fb1279e4ebe719
+Bug: http://hub.qgis.org/issues/9453
+--- a/src/providers/postgres/qgspostgresconn.cpp
++++ b/src/providers/postgres/qgspostgresconn.cpp
+@@ -307,7 +307,7 @@ bool QgsPostgresConn::getTableInfo( bool
+ 
+   mLayersSupported.clear();
+ 
+-  for ( int i = 0; i < 3; i++ )
++  for ( int i = 0; i < (hasTopology() ? 3 : 2); i++ )
+   {
+     QString sql, tableName, schemaName, columnName, typeName, sridName, gtableName;
+     QgsPostgresGeometryColumnType columnType = sctGeometry;
diff --git a/debian/patches/series b/debian/patches/series
index 1a39578..2f6dcf2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,3 +28,4 @@ wms-c-don-t-crash-if-tile-matrix-set-isn-t-available.patch
 use-local-icon.patch
 fix-qreal-vs-double.patch
 mis-detection-of-PostGIS-table-type.patch
+postgres-provider-topology-support.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git