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 49c3881e5396725fccc917c6b019945e54d1f4ff..cc7ddd8166e495651caaea4e30972a108e32a9f0 100644 (file)
--- 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 06020e96bcba713e964bc741ae4fa281aa950557..8c67eef02cb83efac4d7c3d7b2a3a531e988e3a4 100644 (file)
--- 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 18525f0e6dfbd2124fe99ff38fe18d51e137e5fe..474c21cb31c6e4740203d913e1dbc5cecdd4322e 100755 (executable)
--- 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 --------------------"