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

[Patrick Winnertz]

Author: winnie
Date: 2009-08-09 10:41:07 +0000 (Sun, 09 Aug 2009)
New Revision: 234

Modified:
   trunk/debian/patches/bugs/fish_no_report_on_failed_delete.patch
Log:
Refresh patch


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 09:59:34 UTC (rev 233)
+++ trunk/debian/patches/bugs/fish_no_report_on_failed_delete.patch	2009-08-09 10:41:07 UTC (rev 234)
@@ -80,3 +80,43 @@
  	    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)
+     }