git.annexia.org
/
libguestfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2b21eec
)
If LIBGUESTFS_PATH is set, guestfish shouldn't modify the path.
author
Richard Jones
<rjones@redhat.com>
Sat, 25 Apr 2009 09:38:39 +0000
(10:38 +0100)
committer
Richard Jones
<rjones@redhat.com>
Sat, 25 Apr 2009 09:38:39 +0000
(10:38 +0100)
fish/fish.c
patch
|
blob
|
history
diff --git
a/fish/fish.c
b/fish/fish.c
index
1255a2d
..
812197c
100644
(file)
--- a/
fish/fish.c
+++ b/
fish/fish.c
@@
-136,8
+136,12
@@
main (int argc, char *argv[])
/* If developing, add . to the path. Note that libtools interferes
* with this because uninstalled guestfish is a shell script that runs
* the real program with an absolute path. Detect that too.
/* If developing, add . to the path. Note that libtools interferes
* with this because uninstalled guestfish is a shell script that runs
* the real program with an absolute path. Detect that too.
+ *
+ * BUT if LIBGUESTFS_PATH environment variable is already set by
+ * the user, then don't override it.
*/
*/
- if (argv[0] &&
+ if (getenv ("LIBGUESTFS_PATH") == NULL &&
+ argv[0] &&
(argv[0][0] != '/' || strstr (argv[0], "/.libs/lt-") != NULL))
guestfs_set_path (g, ".:" GUESTFS_DEFAULT_PATH);
(argv[0][0] != '/' || strstr (argv[0], "/.libs/lt-") != NULL))
guestfs_set_path (g, ".:" GUESTFS_DEFAULT_PATH);