[Pkg-mc-commits] r235 - trunk/debian/patches/bugs

[Patrick Winnertz]

Author: winnie
Date: 2009-08-09 10:43:48 +0000 (Sun, 09 Aug 2009)
New Revision: 235

Modified:
   trunk/debian/patches/bugs/fish_no_report_on_failed_delete.patch
Log:
Refreshed once again



Modified: trunk/debian/patches/bugs/fish_no_report_on_failed_delete.patch
===================================================================
--- trunk/debian/patches/bugs/fish_no_report_on_failed_delete.patch	2009-08-09 10:41:07 UTC (rev 234)
+++ trunk/debian/patches/bugs/fish_no_report_on_failed_delete.patch	2009-08-09 10:43:48 UTC (rev 235)
@@ -1,8 +1,22 @@
 diff --git a/vfs/fish.c b/vfs/fish.c
-index 1e1ccbe..344aca1 100644
+index 1e1ccbe..7398208 100644
 --- a/vfs/fish.c
 +++ b/vfs/fish.c
-@@ -978,11 +978,17 @@ static int fish_##name (struct vfs_class *me, const char *path1, const char *pat
+@@ -944,8 +944,11 @@ fish_chmod (struct vfs_class *me, const char *path, int mode)
+ {
+     PREFIX
+     g_snprintf(buf, sizeof(buf), "#CHMOD %4.4o /%s\n"
+-				 "chmod %4.4o /%s 2>/dev/null\n"
+-				 "echo '### 000'\n", 
++				 "if chmod %4.4o /%s 2>/dev/null; then\n"
++				    "echo '### 000'\n"
++				 "else\n"
++				    "echo '### 500'\n"
++				 "fi\n",
+ 	    mode & 07777, rpath,
+ 	    mode & 07777, rpath);
+     POSTFIX(OPT_FLUSH);
+@@ -978,11 +981,17 @@ static int fish_##name (struct vfs_class *me, const char *path1, const char *pat
  }
  
  FISH_OP(rename, "#RENAME /%s /%s\n"
@@ -24,7 +38,7 @@
  
  static int fish_symlink (struct vfs_class *me, const char *setto, const char *path)
  {
-@@ -991,8 +997,11 @@ static int fish_symlink (struct vfs_class *me, const char *setto, const char *pa
+@@ -991,8 +1000,11 @@ static int fish_symlink (struct vfs_class *me, const char *setto, const char *pa
      qsetto = strutils_shell_escape (setto);
      g_snprintf(buf, sizeof(buf),
              "#SYMLINK %s /%s\n"
@@ -38,6 +52,32 @@
  	    qsetto, rpath, qsetto, rpath);
      g_free (qsetto);
      POSTFIX(OPT_FLUSH);
+@@ -1017,18 +1029,15 @@ fish_chown (struct vfs_class *me, const char *path, int owner, int group)
+ 	PREFIX
+ 	g_snprintf (buf, sizeof(buf),
+     	    "#CHOWN %s /%s\n"
+-	    "chown %s /%s 2>/dev/null\n"
+-	    "echo '### 000'\n", 
+-	    sowner, rpath,
+-	    sowner, rpath);
++	    "if chown %s:%s /%s 2>/dev/null; then\n"
++		"echo '### 000'\n"
++	    "else\n"
++		"echo '### 500'\n"
++	    "fi\n",
++	    sowner, sgroup, rpath,
++	    sowner, sgroup, rpath);
+ 	fish_send_command (me, super, buf, OPT_FLUSH); 
+ 	/* FIXME: what should we report if chgrp succeeds but chown fails? */
+-	g_snprintf (buf, sizeof(buf),
+-	    "#CHGRP /%s /%s\n"
+-	    "chgrp %s /%s 2>/dev/null\n"
+-	    "echo '### 000'\n", 
+-	    sgroup, rpath,
+-	    sgroup, rpath);
+ 	/* fish_send_command(me, super, buf, OPT_FLUSH); */
+ 	POSTFIX (OPT_FLUSH)
+     }
 @@ -1039,8 +1048,11 @@ static int fish_unlink (struct vfs_class *me, const char *path)
      PREFIX
      g_snprintf(buf, sizeof(buf),
@@ -80,43 +120,3 @@
  	    rpath, rpath);
      POSTFIX(OPT_FLUSH);
  }
-@@ -944,8 +944,11 @@ fish_chmod (struct vfs_class *me, const char *path, int mode)
- {
-     PREFIX
-     g_snprintf(buf, sizeof(buf), "#CHMOD %4.4o /%s\n"
--				 "chmod %4.4o /%s 2>/dev/null\n"
--				 "echo '### 000'\n", 
-+				 "if chmod %4.4o /%s 2>/dev/null; then\n"
-+				    "echo '### 000'\n"
-+				 "else\n"
-+				    "echo '### 500'\n"
-+				 "fi\n",
- 	    mode & 07777, rpath,
- 	    mode & 07777, rpath);
-     POSTFIX(OPT_FLUSH);
-@@ -1026,18 +1029,15 @@ fish_chown (struct vfs_class *me, const char *path, int owner, int group)
- 	PREFIX
- 	g_snprintf (buf, sizeof(buf),
-     	    "#CHOWN %s /%s\n"
--	    "chown %s /%s 2>/dev/null\n"
--	    "echo '### 000'\n", 
--	    sowner, rpath,
--	    sowner, rpath);
-+	    "if chown %s:%s /%s 2>/dev/null; then\n"
-+		"echo '### 000'\n"
-+	    "else\n"
-+		"echo '### 500'\n"
-+	    "fi\n",
-+	    sowner, sgroup, rpath,
-+	    sowner, sgroup, rpath);
- 	fish_send_command (me, super, buf, OPT_FLUSH); 
- 	/* FIXME: what should we report if chgrp succeeds but chown fails? */
--	g_snprintf (buf, sizeof(buf),
--	    "#CHGRP /%s /%s\n"
--	    "chgrp %s /%s 2>/dev/null\n"
--	    "echo '### 000'\n", 
--	    sgroup, rpath,
--	    sgroup, rpath);
- 	/* fish_send_command(me, super, buf, OPT_FLUSH); */
- 	POSTFIX (OPT_FLUSH)
-     }