aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-08-13 22:21:07 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-08-13 22:21:07 +0000
commitd1449162f3958443539a3f7067719e0be077b515 (patch)
tree30b9072a8d793268e9e9fa1fe7ea993f66923b9f
parente384bebe32c4bfcfc163025a30a010f566fbaa71 (diff)
downloadpaludis-d1449162f3958443539a3f7067719e0be077b515.tar.gz
paludis-d1449162f3958443539a3f7067719e0be077b515.tar.xz
(ruby) Don't assume that /etc/revdep-rebuild is complete if it exists.
-rw-r--r--ruby/demos/check_linkage.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/ruby/demos/check_linkage.rb b/ruby/demos/check_linkage.rb
index 581717b..8b1abc9 100644
--- a/ruby/demos/check_linkage.rb
+++ b/ruby/demos/check_linkage.rb
@@ -149,11 +149,10 @@ if File.directory? '/etc/revdep-rebuild' then
prelim_search_dirs += (vars["SEARCH_DIRS"] || "").split
prelim_search_dirs_mask += (vars["SEARCH_DIRS_MASK"] || "").split
end
-else
- prelim_ld_library_mask += %w(libodbcinst.so libodbc.so libjava.so libjvm.so)
- prelim_search_dirs += %w(/bin /sbin /usr/bin /usr/sbin /lib* /usr/lib*)
- prelim_search_dirs_mask += %w(/opt/OpenOffice /usr/lib/openoffice)
end
+prelim_ld_library_mask += %w(libodbcinst.so libodbc.so libjava.so libjvm.so)
+prelim_search_dirs += %w(/bin /sbin /usr/bin /usr/sbin /lib* /usr/lib*)
+prelim_search_dirs_mask += %w(/opt/OpenOffice /usr/lib/openoffice)
vars = read_shell_vars "/etc/profile.env"
prelim_search_dirs += (vars["PATH"] || "").split(/:/)