]>
Commit | Line | Data |
---|---|---|
55217583 JB |
1 | --- rpm-4.4.5/lib/rpmlock.c.orig 2006-02-21 01:03:07.000000000 +0100 |
2 | +++ rpm-4.4.5/lib/rpmlock.c 2006-02-28 21:57:10.968577000 +0100 | |
2c1ead80 JB |
3 | @@ -39,7 +39,11 @@ |
4 | /* XXX oneshot to determine path for fcntl lock. */ | |
5 | /* XXX rpmlock_path is set once, cannot be changed with %{_rpmlock_path}. */ | |
6 | if (!oneshot) { | |
55217583 JB |
7 | - const char * t = rpmGenPath(rootdir, rpmlock_path_default, NULL); |
8 | + const char * t = NULL; | |
2c1ead80 JB |
9 | + char * check = rpmExpand(rpmlock_path_default, NULL); |
10 | + if (check[0] != '\0') | |
11 | + t = rpmGenPath(rootdir, rpmlock_path_default, NULL); | |
12 | + free(check); | |
13 | if (t == NULL || *t == '\0' || *t == '%') | |
14 | t = _free(t); | |
15 | rpmlock_path = t; |