sgallagh / rpms / rpm

Forked from rpms/rpm 4 years ago
Clone
Paul Nasrat 57dc36f
--- rpm-4.4.2/lib/rpmlock.c.userlock	2006-02-23 15:24:46.000000000 -0500
Paul Nasrat 57dc36f
+++ rpm-4.4.2/lib/rpmlock.c	2006-02-23 15:25:53.000000000 -0500
Paul Nasrat 57dc36f
@@ -37,7 +37,7 @@
Paul Nasrat 57dc36f
 
Paul Nasrat 57dc36f
 	/* XXX oneshot to determine path for fcntl lock. */
Paul Nasrat 57dc36f
 	if (rpmlock_path == NULL) {
Paul Nasrat 57dc36f
-	    char * t = rpmExpand(rpmlock_path_default, NULL);
Paul Nasrat 57dc36f
+	    char * t = rpmGenPath(rootdir, rpmlock_path_default, NULL);
Paul Nasrat 57dc36f
 	    if (t == NULL || *t == '\0' || *t == '%')
Paul Nasrat 57dc36f
 		t = RPMLOCK_PATH;
Paul Nasrat 57dc36f
 	    rpmlock_path = xstrdup(t);
Paul Nasrat 57dc36f
@@ -129,7 +129,7 @@
Paul Nasrat 57dc36f
 	const char *rootDir = rpmtsRootDir(ts);
Paul Nasrat 57dc36f
 	rpmlock lock;
Paul Nasrat 57dc36f
 
Paul Nasrat 57dc36f
-	if (!rootDir)
Paul Nasrat 57dc36f
+	if (!rootDir || rpmtsChrootDone(ts))
Paul Nasrat 57dc36f
 		rootDir = "/";
Paul Nasrat 57dc36f
 	lock = rpmlock_new(rootDir);
Paul Nasrat 57dc36f
 /*@-branchstate@*/