summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Zak2013-04-09 12:52:09 +0200
committerKarel Zak2013-04-09 12:52:09 +0200
commit35cf827870c4777dc942873ef3eb658efa5b7351 (patch)
treedc2ba7daf10b8bc1f883f6f37d969bdec24b1220
parentlibblkid: fix DBG() (diff)
downloadkernel-qcow2-util-linux-35cf827870c4777dc942873ef3eb658efa5b7351.tar.gz
kernel-qcow2-util-linux-35cf827870c4777dc942873ef3eb658efa5b7351.tar.xz
kernel-qcow2-util-linux-35cf827870c4777dc942873ef3eb658efa5b7351.zip
libblkid: support LIBBLKID_DEBUG= only
... the BLKID_DEBUG= is not more supported. Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r--Documentation/releases/v2.23-ReleaseNotes3
-rw-r--r--libblkid/src/cache.c3
-rwxr-xr-xtests/run.sh1
3 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/releases/v2.23-ReleaseNotes b/Documentation/releases/v2.23-ReleaseNotes
index 49c3881e5..cc7ddd816 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 06020e96b..8c67eef02 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 18525f0e6..474c21cb3 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 --------------------"