git-annex/standalone/android/git.patch

48 lines
1.2 KiB
Diff
Raw Normal View History

2014-10-16 16:56:15 +00:00
From 6134cc328f513e32895462e884487513b28029ba Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
2014-10-16 16:56:15 +00:00
Date: Wed, 13 Aug 2014 13:50:56 -0400
Subject: [PATCH] avoid using of chmod on android when changing config
This breaks on Android's /sdcard, which has a variety of FUSE
implentations, all total shite.
2014-08-13 17:51:32 +00:00
---
config.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/config.c b/config.c
2014-10-16 16:56:15 +00:00
index 058505c..16854b2 100644
--- a/config.c
+++ b/config.c
2014-10-16 16:56:15 +00:00
@@ -1634,12 +1634,14 @@ int git_config_set_multivar_in_file(const char *config_filename,
MAP_PRIVATE, in_fd, 0);
close(in_fd);
2014-08-13 17:51:32 +00:00
+ /* not on android
2014-10-16 16:56:15 +00:00
if (chmod(lock->filename, st.st_mode & 07777) < 0) {
2014-08-13 17:51:32 +00:00
error("chmod on %s failed: %s",
2014-10-16 16:56:15 +00:00
lock->filename, strerror(errno));
2014-08-13 17:51:32 +00:00
ret = CONFIG_NO_WRITE;
goto out_free;
}
+ */
if (store.seen == 0)
store.seen = 1;
2014-10-16 16:56:15 +00:00
@@ -1813,11 +1815,13 @@ int git_config_rename_section_in_file(const char *config_filename,
2014-08-13 17:51:32 +00:00
fstat(fileno(config_file), &st);
+ /* not on android
2014-10-16 16:56:15 +00:00
if (chmod(lock->filename, st.st_mode & 07777) < 0) {
2014-08-13 17:51:32 +00:00
ret = error("chmod on %s failed: %s",
2014-10-16 16:56:15 +00:00
lock->filename, strerror(errno));
2014-08-13 17:51:32 +00:00
goto out;
}
2014-08-13 17:51:32 +00:00
+ */
while (fgets(buf, sizeof(buf), config_file)) {
int i;
--
2014-10-16 16:56:15 +00:00
2.1.0.rc1