diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2009-07-05 14:22:57 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2009-07-05 14:22:57 +0000 |
| commit | 0396fad15c71f0e3abfdd35cbc55f5ceb06846ec (patch) | |
| tree | b7f87252feb05802feafa7b197054f112f47d51f /libgphoto2/gphoto2-filesys.c | |
| parent | 33db019dc907c48c54e23694c45718f49094267d (diff) | |
| download | libgphoto2-0396fad15c71f0e3abfdd35cbc55f5ceb06846ec.tar.gz | |
upload metadata of course gets "file exists"... ignore that
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@12195 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2/gphoto2-filesys.c')
| -rw-r--r-- | libgphoto2/gphoto2-filesys.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libgphoto2/gphoto2-filesys.c b/libgphoto2/gphoto2-filesys.c index eacb18476..ee4eb913a 100644 --- a/libgphoto2/gphoto2-filesys.c +++ b/libgphoto2/gphoto2-filesys.c @@ -1244,6 +1244,7 @@ gp_filesystem_put_file (CameraFilesystem *fs, CameraFile *file, GPContext *context) { CameraFilesystemFolder *f; + int ret; CHECK_NULL (fs && folder && file); CC (context); @@ -1263,7 +1264,10 @@ gp_filesystem_put_file (CameraFilesystem *fs, /* Upload the file */ CR (fs->put_file_func (fs, folder, filename, type, file, fs->folder_data, context)); /* And upload it to internal structure too */ - return append_file (fs, f, filename, file, context); + ret = append_file (fs, f, filename, file, context); + if (type != GP_FILE_TYPE_NORMAL) /* FIXME perhaps check before append_file? */ + return GP_OK; + return ret; } /** |