Created VSIError to report VSI errors.

.travis.yml

@@ -83,6 +83,10 @@ install:
   - make generate
   - make
   - cd ../..
+  - cd swig/python
+  - make generate
+  - make
+  - cd ../..
   - sudo rm -f /usr/lib/libgdal.so*
   - sudo make install
   - sudo ldconfig
@@ -149,4 +153,3 @@ notifications:
     channels:
       - "irc.freenode.org#gdal"
     use_notice: true
-

autotest/gcore/basic_test.py

@@ -40,40 +40,49 @@
 # Nothing exciting here. Just trying to open non existing files,
 # or empty names, or files that are not valid datasets...
 
+def matches_non_existing_error_msg(msg):
+    m1 = "does not exist in the file system,\nand is not recognized as a supported dataset name.\n" in msg
+    m2 = msg == 'No such file or directory'
+    return m1 or m2
+
 def basic_test_1():
     gdal.PushErrorHandler( 'CPLQuietErrorHandler' )
     ds = gdal.Open('non_existing_ds', gdal.GA_ReadOnly)
     gdal.PopErrorHandler()
-    if ds is None and gdal.GetLastErrorMsg() == '`non_existing_ds\' does not exist in the file system,\nand is not recognized as a supported dataset name.\n':
+    if ds is None and matches_non_existing_error_msg(gdal.GetLastErrorMsg()):
         return 'success'
     else:
+        gdaltest.post_reason('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
         return 'fail'
 
 def basic_test_2():
     gdal.PushErrorHandler( 'CPLQuietErrorHandler' )
     ds = gdal.Open('non_existing_ds', gdal.GA_Update)
     gdal.PopErrorHandler()
-    if ds is None and gdal.GetLastErrorMsg() == '`non_existing_ds\' does not exist in the file system,\nand is not recognized as a supported dataset name.\n':
+    if ds is None and matches_non_existing_error_msg(gdal.GetLastErrorMsg()):
         return 'success'
     else:
+        gdaltest.post_reason('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
         return 'fail'
 
 def basic_test_3():
     gdal.PushErrorHandler( 'CPLQuietErrorHandler' )
     ds = gdal.Open('', gdal.GA_ReadOnly)
     gdal.PopErrorHandler()
-    if ds is None and gdal.GetLastErrorMsg() == '`\' does not exist in the file system,\nand is not recognized as a supported dataset name.\n':
+    if ds is None and matches_non_existing_error_msg(gdal.GetLastErrorMsg()):
         return 'success'
     else:
+        gdaltest.post_reason('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
         return 'fail'
 
 def basic_test_4():
     gdal.PushErrorHandler( 'CPLQuietErrorHandler' )
     ds = gdal.Open('', gdal.GA_Update)
     gdal.PopErrorHandler()
-    if ds is None and gdal.GetLastErrorMsg() == '`\' does not exist in the file system,\nand is not recognized as a supported dataset name.\n':
+    if ds is None and matches_non_existing_error_msg(gdal.GetLastErrorMsg()):
         return 'success'
     else:
+        gdaltest.post_reason('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
         return 'fail'
 
 def basic_test_5():
@@ -106,8 +115,8 @@ def basic_test_7_internal():
     except:
         # Special case: we should still be able to get the error message
         # until we call a new GDAL function
-        if gdal.GetLastErrorMsg() != '`non_existing_ds\' does not exist in the file system,\nand is not recognized as a supported dataset name.\n':
-            gdaltest.post_reason('did not get expected error message')
+        if not matches_non_existing_error_msg(gdal.GetLastErrorMsg()):
+            gdaltest.post_reason('did not get expected error message, got %s' % gdal.GetLastErrorMsg())
             return 'fail'
 
         if gdal.GetLastErrorType() == 0:

autotest/gcore/vsis3.py

@@ -36,6 +36,12 @@
 import gdaltest
 import webserver
 
+def open_for_read(uri):
+    """
+    Opens a test file for reading.
+    """
+    return gdal.VSIFOpenExL(uri, 'rb', 1)
+
 ###############################################################################
 def vsis3_init():
 
@@ -59,55 +65,57 @@ def vsis3_1():
     if drv is None:
         return 'skip'
 
+        # RETODO: Bind to swig, change test
+
     # Missing AWS_SECRET_ACCESS_KEY
     gdal.ErrorReset()
     with gdaltest.error_handler():
-        f = gdal.VSIFOpenL('/vsis3/foo/bar', 'rb')
-    if f is not None or gdal.GetLastErrorMsg().find('AWS_SECRET_ACCESS_KEY') < 0:
+        f = open_for_read('/vsis3/foo/bar')
+    if f is not None or gdal.VSIGetLastErrorMsg().find('AWS_SECRET_ACCESS_KEY') < 0:
         gdaltest.post_reason('fail')
-        print(gdal.GetLastErrorMsg())
+        print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
-        f = gdal.VSIFOpenL('/vsis3_streaming/foo/bar', 'rb')
-    if f is not None or gdal.GetLastErrorMsg().find('AWS_SECRET_ACCESS_KEY') < 0:
+        f = open_for_read('/vsis3_streaming/foo/bar')
+    if f is not None or gdal.VSIGetLastErrorMsg().find('AWS_SECRET_ACCESS_KEY') < 0:
         gdaltest.post_reason('fail')
-        print(gdal.GetLastErrorMsg())
+        print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
     gdal.SetConfigOption('AWS_SECRET_ACCESS_KEY', 'AWS_SECRET_ACCESS_KEY')
 
     # Missing AWS_ACCESS_KEY_ID
     gdal.ErrorReset()
     with gdaltest.error_handler():
-        f = gdal.VSIFOpenL('/vsis3/foo/bar', 'rb')
-    if f is not None or gdal.GetLastErrorMsg().find('AWS_ACCESS_KEY_ID') < 0:
+        f = open_for_read('/vsis3/foo/bar')
+    if f is not None or gdal.VSIGetLastErrorMsg().find('AWS_ACCESS_KEY_ID') < 0:
         gdaltest.post_reason('fail')
-        print(gdal.GetLastErrorMsg())
+        print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
     gdal.SetConfigOption('AWS_ACCESS_KEY_ID', 'AWS_ACCESS_KEY_ID')
 
     # ERROR 1: The AWS Access Key Id you provided does not exist in our records.
     gdal.ErrorReset()
     with gdaltest.error_handler():
-        f = gdal.VSIFOpenL('/vsis3/foo/bar.baz', 'rb')
-    if f is not None or gdal.GetLastErrorMsg() == '':
+        f = open_for_read('/vsis3/foo/bar.baz')
+    if f is not None or gdal.VSIGetLastErrorMsg() == '':
         if f is not None:
             gdal.VSIFCloseL(f)
         if gdal.GetConfigOption('APPVEYOR') is not None:
             return 'success'
         gdaltest.post_reason('fail')
-        print(gdal.GetLastErrorMsg())
+        print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
-        f = gdal.VSIFOpenL('/vsis3_streaming/foo/bar.baz', 'rb')
-    if f is not None or gdal.GetLastErrorMsg() == '':
+        f = open_for_read('/vsis3_streaming/foo/bar.baz')
+    if f is not None or gdal.VSIGetLastErrorMsg() == '':
         gdaltest.post_reason('fail')
-        print(gdal.GetLastErrorMsg())
+        print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
     return 'success'
@@ -147,7 +155,7 @@ def vsis3_2():
     gdal.SetConfigOption('AWS_VIRTUAL_HOSTING', 'NO')
     gdal.SetConfigOption('AWS_S3_ENDPOINT', '127.0.0.1:%d' % gdaltest.webserver_port)
 
-    f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket/resource', 'rb')
+    f = open_for_read('/vsis3/s3_fake_bucket/resource')
     if f is None:
         gdaltest.post_reason('fail')
         return 'fail'
@@ -159,7 +167,7 @@ def vsis3_2():
         print(data)
         return 'fail'
 
-    f = gdal.VSIFOpenL('/vsis3_streaming/s3_fake_bucket/resource', 'rb')
+    f = open_for_read('/vsis3_streaming/s3_fake_bucket/resource')
     if f is None:
         gdaltest.post_reason('fail')
         return 'fail'
@@ -173,7 +181,7 @@ def vsis3_2():
 
     # Test with temporary credentials
     gdal.SetConfigOption('AWS_SESSION_TOKEN', 'AWS_SESSION_TOKEN')
-    f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket_with_session_token/resource', 'rb')
+    f = open_for_read('/vsis3/s3_fake_bucket_with_session_token/resource')
     if f is None:
         gdaltest.post_reason('fail')
         return 'fail'
@@ -203,7 +211,7 @@ def vsis3_2():
         return 'fail'
 
     # Test region and endpoint 'redirects'
-    f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket/redirect', 'rb')
+    f = open_for_read('/vsis3/s3_fake_bucket/redirect')
     if f is None:
         gdaltest.post_reason('fail')
         return 'fail'
@@ -216,7 +224,7 @@ def vsis3_2():
         return 'fail'
 
     # Test region and endpoint 'redirects'
-    f = gdal.VSIFOpenL('/vsis3_streaming/s3_fake_bucket/redirect', 'rb')
+    f = open_for_read('/vsis3_streaming/s3_fake_bucket/redirect')
     if f is None:
         gdaltest.post_reason('fail')
         return 'fail'
@@ -230,50 +238,50 @@ def vsis3_2():
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
-        f = gdal.VSIFOpenL('/vsis3_streaming/s3_fake_bucket/non_xml_error', 'rb')
-    if f is not None or gdal.GetLastErrorMsg().find('bla') < 0:
+        f = open_for_read('/vsis3_streaming/s3_fake_bucket/non_xml_error')
+    if f is not None or gdal.VSIGetLastErrorMsg().find('bla') < 0:
         gdaltest.post_reason('fail')
-        print(gdal.GetLastErrorMsg())
+        print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
-        f = gdal.VSIFOpenL('/vsis3_streaming/s3_fake_bucket/invalid_xml_error', 'rb')
-    if f is not None or gdal.GetLastErrorMsg().find('<oops>') < 0:
+        f = open_for_read('/vsis3_streaming/s3_fake_bucket/invalid_xml_error')
+    if f is not None or gdal.VSIGetLastErrorMsg().find('<oops>') < 0:
         gdaltest.post_reason('fail')
-        print(gdal.GetLastErrorMsg())
+        print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
-        f = gdal.VSIFOpenL('/vsis3_streaming/s3_fake_bucket/no_code_in_error', 'rb')
-    if f is not None or gdal.GetLastErrorMsg().find('<Error/>') < 0:
+        f = open_for_read('/vsis3_streaming/s3_fake_bucket/no_code_in_error')
+    if f is not None or gdal.VSIGetLastErrorMsg().find('<Error/>') < 0:
         gdaltest.post_reason('fail')
-        print(gdal.GetLastErrorMsg())
+        print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
-        f = gdal.VSIFOpenL('/vsis3_streaming/s3_fake_bucket/no_region_in_AuthorizationHeaderMalformed_error', 'rb')
-    if f is not None or gdal.GetLastErrorMsg().find('<Error>') < 0:
+        f = open_for_read('/vsis3_streaming/s3_fake_bucket/no_region_in_AuthorizationHeaderMalformed_error')
+    if f is not None or gdal.VSIGetLastErrorMsg().find('<Error>') < 0:
         gdaltest.post_reason('fail')
-        print(gdal.GetLastErrorMsg())
+        print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
-        f = gdal.VSIFOpenL('/vsis3_streaming/s3_fake_bucket/no_endpoint_in_PermanentRedirect_error', 'rb')
-    if f is not None or gdal.GetLastErrorMsg().find('<Error>') < 0:
+        f = open_for_read('/vsis3_streaming/s3_fake_bucket/no_endpoint_in_PermanentRedirect_error')
+    if f is not None or gdal.VSIGetLastErrorMsg().find('<Error>') < 0:
         gdaltest.post_reason('fail')
-        print(gdal.GetLastErrorMsg())
+        print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
     gdal.ErrorReset()
     with gdaltest.error_handler():
-        f = gdal.VSIFOpenL('/vsis3_streaming/s3_fake_bucket/no_message_in_error', 'rb')
-    if f is not None or gdal.GetLastErrorMsg().find('<Error>') < 0:
+        f = open_for_read('/vsis3_streaming/s3_fake_bucket/no_message_in_error')
+    if f is not None or gdal.VSIGetLastErrorMsg().find('<Error>') < 0:
         gdaltest.post_reason('fail')
-        print(gdal.GetLastErrorMsg())
+        print(gdal.VSIGetLastErrorMsg())
         return 'fail'
 
     return 'success'
@@ -285,7 +293,7 @@ def vsis3_3():
 
     if gdaltest.webserver_port == 0:
         return 'skip'
-    f = gdal.VSIFOpenL('/vsis3/s3_fake_bucket2/a_dir/resource3.bin', 'rb')
+    f = open_for_read('/vsis3/s3_fake_bucket2/a_dir/resource3.bin')
     if f is None:
         gdaltest.post_reason('fail')
         return 'fail'
@@ -562,7 +570,7 @@ def vsis3_extra_1():
         print('Missing S3_RESOURCE for running gdaltest_list_extra')
         return 'skip'
 
-    f = gdal.VSIFOpenL('/vsis3/' + gdal.GetConfigOption('S3_RESOURCE'), 'rb')
+    f = open_for_read('/vsis3/' + gdal.GetConfigOption('S3_RESOURCE'))
     if f is None:
         gdaltest.post_reason('fail')
         return 'fail'
@@ -575,7 +583,7 @@ def vsis3_extra_1():
         return 'fail'
 
     # Same with /vsis3_streaming/
-    f = gdal.VSIFOpenL('/vsis3_streaming/' + gdal.GetConfigOption('S3_RESOURCE'), 'rb')
+    f = open_for_read('/vsis3_streaming/' + gdal.GetConfigOption('S3_RESOURCE'))
     if f is None:
         gdaltest.post_reason('fail')
         return 'fail'
@@ -589,7 +597,7 @@ def vsis3_extra_1():
 
     # Invalid bucket : "The specified bucket does not exist"
     gdal.ErrorReset()
-    f = gdal.VSIFOpenL('/vsis3/not_existing_bucket/foo', 'rb')
+    f = open_for_read('/vsis3/not_existing_bucket/foo')
     with gdaltest.error_handler():
         gdal.VSIFReadL(1, 1, f)
     gdal.VSIFCloseL(f)
@@ -600,7 +608,7 @@ def vsis3_extra_1():
 
     # Invalid resource
     gdal.ErrorReset()
-    f = gdal.VSIFOpenL('/vsis3_streaming/' + gdal.GetConfigOption('S3_RESOURCE') + '/invalid_resource.baz', 'rb')
+    f = open_for_read('/vsis3_streaming/' + gdal.GetConfigOption('S3_RESOURCE') + '/invalid_resource.baz')
     if f is not None:
         gdaltest.post_reason('fail')
         print(gdal.GetLastErrorMsg())

autotest/utilities/test_gdal_translate.py

@@ -361,7 +361,7 @@ def test_gdal_translate_13():
     if ds is None:
         return 'fail'
 
-    md = ds.GetMetadata() 
+    md = ds.GetMetadata()
     if 'TIFFTAG_DOCUMENTNAME' not in md:
         gdaltest.post_reason('Did not get TIFFTAG_DOCUMENTNAME')
         return 'fail'
@@ -383,7 +383,7 @@ def test_gdal_translate_14():
     if ds is None:
         return 'fail'
 
-    md = ds.GetMetadata('IMAGE_STRUCTURE') 
+    md = ds.GetMetadata('IMAGE_STRUCTURE')
     if 'COMPRESSION' not in md or md['COMPRESSION'] != 'LZW':
         gdaltest.post_reason('Did not get COMPRESSION')
         return 'fail'
@@ -517,7 +517,7 @@ def test_gdal_translate_19():
         return 'skip'
 
     ds = gdal.GetDriverByName('GTiff').Create('tmp/test_gdal_translate_19_src.tif',1,1,2)
-    ct = gdal.ColorTable() 
+    ct = gdal.ColorTable()
     ct.SetColorEntry( 127, (1,2,3,255) )
     ds.GetRasterBand( 1 ).SetRasterColorTable( ct )
     ds.GetRasterBand( 1 ).Fill(127)
@@ -977,7 +977,7 @@ def test_gdal_translate_35():
         return 'fail'
 
     (out, err) = gdaltest.runexternal_out_and_err(test_cli_utilities.get_gdal_translate_path() + ' /non_existing_path/non_existing.tif /vsimem/out.tif')
-    if err.find('does not exist in the file system') < 0:
+    if err.find('No such file or directory') < 0:
         gdaltest.post_reason('fail')
         print(err)
         return 'fail'

gdal/Vagrantfile

@@ -16,15 +16,17 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.hostname = "gdal-vagrant"
   config.vm.box_url = "http://files.vagrantup.com/precise64.box"
   config.vm.host_name = "gdal-vagrant"
-  
+
   config.vm.network :forwarded_port, guest: 80, host: 8080
 
+  config.vm.synced_folder "../autotest/", "/home/vagrant/autotest/"
+
   config.vm.provider :virtualbox do |vb|
      vb.customize ["modifyvm", :id, "--memory", vm_ram]
      vb.customize ["modifyvm", :id, "--cpus", vm_cpu]
      vb.customize ["modifyvm", :id, "--ioapic", "on"]
      vb.name = "gdal-vagrant"
-   end  
+   end
 
   ppaRepos = [
     "ppa:ubuntugis/ubuntugis-unstable", "ppa:marlam/gta"

gdal/apps/gdalinfo_bin.cpp

@@ -127,8 +127,9 @@ int main( int argc, char ** argv )
     while (__AFL_LOOP(1000)) {
         iIter ++;
 #endif
+
     GDALDatasetH hDataset
-        = GDALOpenEx( psOptionsForBinary->pszFilename, GDAL_OF_READONLY | GDAL_OF_RASTER, NULL,
+        = GDALOpenEx( psOptionsForBinary->pszFilename, GDAL_OF_READONLY | GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR, NULL,
                       (const char* const* )psOptionsForBinary->papszOpenOptions, NULL );
 
     if( hDataset == NULL )