Skip to content

Commit

Permalink
Fix rustpkg install for git repositories
Browse files Browse the repository at this point in the history
  • Loading branch information
Jakub committed Sep 12, 2013
1 parent 248765a commit 3d14e82
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
12 changes: 7 additions & 5 deletions src/librustpkg/package_source.rs
Expand Up @@ -18,7 +18,7 @@ use context::*;
use crate::Crate;
use messages::*;
use source_control::{git_clone, git_clone_general};
use path_util::{find_dir_using_rust_path_hack, default_workspace};
use path_util::{find_dir_using_rust_path_hack, default_workspace, make_dir_rwx_recursive};
use util::compile_crate;
use workspace::is_workspace;
use workcache_support;
Expand Down Expand Up @@ -166,12 +166,14 @@ impl PkgSrc {
url, clone_target.to_str(), pkgid.version.to_str());

if git_clone_general(url, &clone_target, &pkgid.version) {
// since the operation succeeded, move clone_target to local
if !os::rename_file(&clone_target, local) {
None
// Since the operation succeeded, move clone_target to local.
// First, create all ancestor directories.
if make_dir_rwx_recursive(&local.pop())
&& os::rename_file(&clone_target, local) {
Some(local.clone())
}
else {
Some(local.clone())
None
}
}
else {
Expand Down
2 changes: 2 additions & 0 deletions src/librustpkg/path_util.rs
Expand Up @@ -43,6 +43,8 @@ pub static U_RWX: i32 = (S_IRUSR | S_IWUSR | S_IXUSR) as i32;
/// succeeded.
pub fn make_dir_rwx(p: &Path) -> bool { os::make_dir(p, U_RWX) }

pub fn make_dir_rwx_recursive(p: &Path) -> bool { os::mkdir_recursive(p, U_RWX) }

// n.b. The next three functions ignore the package version right
// now. Should fix that.

Expand Down

5 comments on commit 3d14e82

@bors
Copy link
Contributor

@bors bors commented on 3d14e82 Sep 13, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 3d14e82 Sep 13, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging jakub-/rust/rustpkg-install-mkdir-p = 3d14e82 into auto

@bors
Copy link
Contributor

@bors bors commented on 3d14e82 Sep 13, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jakub-/rust/rustpkg-install-mkdir-p = 3d14e82 merged ok, testing candidate = fd39bd1

@bors
Copy link
Contributor

@bors bors commented on 3d14e82 Sep 13, 2013

@bors
Copy link
Contributor

@bors bors commented on 3d14e82 Sep 13, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = fd39bd1

Please sign in to comment.