about summary refs log tree commit diff
path: root/src/librustpkg/package_source.rs
diff options
context:
space:
mode:
authorTim Chevalier <chevalier@alum.wellesley.edu>2013-09-24 12:10:44 -0700
committerTim Chevalier <chevalier@alum.wellesley.edu>2013-09-25 11:12:24 -0700
commit667adad26f9cc1cfa4eeba8aee15035da7544f8c (patch)
treee76fcb7c9bf1a09994fabb3c7be62609dc2bd95b /src/librustpkg/package_source.rs
parent22654165c697cac912159daedbfb731fbc7c175d (diff)
downloadrust-667adad26f9cc1cfa4eeba8aee15035da7544f8c.tar.gz
rust-667adad26f9cc1cfa4eeba8aee15035da7544f8c.zip
rustpkg: Search for packages correctly when using the rust_path_hack
Previously, any package would match any other package ID when searching
using the rust_path_hack, so long as the directory had one or more crate
files in it. Now, rustpkg checks that the parent directory matches the
package ID.

Closes #9273
Diffstat (limited to 'src/librustpkg/package_source.rs')
-rw-r--r--src/librustpkg/package_source.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustpkg/package_source.rs b/src/librustpkg/package_source.rs
index 4bf647b011d..c2fddafd5fe 100644
--- a/src/librustpkg/package_source.rs
+++ b/src/librustpkg/package_source.rs
@@ -59,7 +59,8 @@ impl PkgSrc {
         use conditions::nonexistent_package::cond;
 
         debug!("Checking package source for package ID %s, \
-               workspace = %s", id.to_str(), workspace.to_str());
+               workspace = %s use_rust_path_hack = %?",
+               id.to_str(), workspace.to_str(), use_rust_path_hack);
 
         let mut to_try = ~[];
         if use_rust_path_hack {