[Glibc-bsd-commits] r3625 - in trunk/ufsutils/debian: . patches

[Aurelien Jarno]

Author: aurel32
Date: 2011-07-23 17:25:34 +0000 (Sat, 23 Jul 2011)
New Revision: 3625

Modified:
   trunk/ufsutils/debian/changelog
   trunk/ufsutils/debian/patches/01_libufs.patch
Log:
  * Fix 01_libufs.patch to correctly character or block devices.  Closes:
    #526586, #634158.



Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog	2011-07-21 18:15:01 UTC (rev 3624)
+++ trunk/ufsutils/debian/changelog	2011-07-23 17:25:34 UTC (rev 3625)
@@ -1,3 +1,11 @@
+ufsutils (8.2-2) UNRELEASED; urgency=low
+
+  [ Aurelien Jarno ]
+  * Fix 01_libufs.patch to correctly character or block devices.  Closes:
+    #526586, #634158.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 23 Jul 2011 19:23:51 +0200
+
 ufsutils (8.2-1) unstable; urgency=low
 
   [ Robert Millan ]

Modified: trunk/ufsutils/debian/patches/01_libufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/01_libufs.patch	2011-07-21 18:15:01 UTC (rev 3624)
+++ trunk/ufsutils/debian/patches/01_libufs.patch	2011-07-23 17:25:34 UTC (rev 3625)
@@ -14,7 +14,7 @@
  		/* Possibly a disk image, give it a try.  */
  		;
 -	} else if (ret >= 0 && S_ISCHR(st.st_mode)) {
-+	} else if (ret >= 0 && (S_ISCHR(st.st_mode) && S_ISBLK(st.st_mode))) {
++	} else if (ret >= 0 && (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode))) {
  		/* This is what we need, do nothing. */
  		;
  	} else if ((fs = getfsfile(name)) != NULL) {