From: Karel Zak <kzak@redhat.com>
Date: Tue, 9 Apr 2013 10:52:09 +0000 (+0200)
Subject: libblkid: support LIBBLKID_DEBUG= only
X-Git-Tag: v2.23-rc2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35cf827870c4777dc942873ef3eb658efa5b7351;p=thirdparty%2Futil-linux.git

libblkid: support LIBBLKID_DEBUG= only

 ... the BLKID_DEBUG= is not more supported.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/Documentation/releases/v2.23-ReleaseNotes b/Documentation/releases/v2.23-ReleaseNotes
index 49c3881e53..cc7ddd8166 100644
--- a/Documentation/releases/v2.23-ReleaseNotes
+++ b/Documentation/releases/v2.23-ReleaseNotes
@@ -10,6 +10,9 @@ version.
 
 The command chkdupexe has been REMOVED from util-linux.
 
+The library libblkid supports LIBBLKID_DEBUG=<mask> environment variable to
+print debug messages on stderr. The old BLKID_DEBUG= is no more supported.
+
 Release highlights
 ------------------
 
diff --git a/libblkid/src/cache.c b/libblkid/src/cache.c
index 06020e96bc..8c67eef02c 100644
--- a/libblkid/src/cache.c
+++ b/libblkid/src/cache.c
@@ -59,9 +59,6 @@ void blkid_init_debug(int mask)
 	if (!mask)
 	{
 		char *dstr = getenv("LIBBLKID_DEBUG");
-
-		if (!dstr)
-			dstr = getenv("BLKID_DEBUG");	/* for backward compatibility */
 		if (dstr)
 			blkid_debug_mask = strtoul(dstr, 0, 0);
 	} else
diff --git a/tests/run.sh b/tests/run.sh
index 18525f0e6d..474c21cb31 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -111,7 +111,6 @@ fi
 unset LIBMOUNT_DEBUG
 unset LIBBLKID_DEBUG
 unset LIBFDISK_DEBUG
-unset BLKID_DEBUG
 
 echo
 echo "-------------------- util-linux regression tests --------------------"