[OGR] Don't call repack after OGR_L_SyncToDisk if compiled against gd…

…al-2.2.0+ OGR_L_SyncToDisk internally does a repack with gdal-2.2.0 onwards
qgis · Oct 4, 2017 · 7eb2475 · 7eb2475
1 parent 4e2e360
commit 7eb2475
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -3409,13 +3409,16 @@ bool QgsOgrProvider::syncToDisc()
     pushError( tr( "OGR error syncing to disk: %1" ).arg( CPLGetLastErrorMsg() ) );
   }
 
+  // Repack is done automatically on OGR_L_SyncToDisk with gdal-2.2.0+
+#if !defined(GDAL_VERSION_NUM) || GDAL_VERSION_NUM < 2020000
   if ( !mDeferRepack )
   {
     if ( mShapefileMayBeCorrupted )
       repack();
 
     mShapefileMayBeCorrupted = false;
   }
+#endif
 
   QgsOgrConnPool::instance()->ref( dataSourceUri() );
   if ( shapeIndex )