From 2c1ead80a6741b3222ba7410fdb0340d72d3bd84 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 16 Dec 2005 00:00:10 +0000 Subject: [PATCH] - don't attempt to create lock with a pathname of existing directory if _rpmlock_path is not defined Changed files: rpm-empty-rpmlock-path.patch -> 1.1 --- rpm-empty-rpmlock-path.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 rpm-empty-rpmlock-path.patch diff --git a/rpm-empty-rpmlock-path.patch b/rpm-empty-rpmlock-path.patch new file mode 100644 index 0000000..fc39592 --- /dev/null +++ b/rpm-empty-rpmlock-path.patch @@ -0,0 +1,15 @@ +--- rpm-4.4.4/lib/rpmlock.c.orig 2005-12-08 19:32:31.000000000 +0100 ++++ rpm-4.4.4/lib/rpmlock.c 2005-12-16 01:00:31.601268584 +0100 +@@ -39,7 +39,11 @@ + /* XXX oneshot to determine path for fcntl lock. */ + /* XXX rpmlock_path is set once, cannot be changed with %{_rpmlock_path}. */ + if (!oneshot) { +- char * t = rpmGenPath(rootdir, rpmlock_path_default, NULL); ++ char * t = NULL; ++ char * check = rpmExpand(rpmlock_path_default, NULL); ++ if (check[0] != '\0') ++ t = rpmGenPath(rootdir, rpmlock_path_default, NULL); ++ free(check); + if (t == NULL || *t == '\0' || *t == '%') + t = _free(t); + rpmlock_path = t; -- 2.43.0