Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cargo package: overwrite existing tarballs #2828

Merged
merged 1 commit into from
Jul 6, 2016
Merged

cargo package: overwrite existing tarballs #2828

merged 1 commit into from
Jul 6, 2016

Conversation

bennofs
Copy link
Contributor

@bennofs bennofs commented Jul 5, 2016

Previously, cargo package did not do anything if a tarball already
existed. This is wrong, because the source may have changed and cargo
does not do any dependency tracking for package tarballs yet, so it did
not notice this.

This commit changes cargo package to always overwrite existing tarballs,
which works fine until proper dependency tracking is implemented.

Fixes #2799

@rust-highfive
Copy link

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@bennofs
Copy link
Contributor Author

bennofs commented Jul 5, 2016

Woops sry for the messy diff, I accidently ran rustfmt over this. If that is a problem, I can try to clean up the patch and remove unnecessary re-formats.

@alexcrichton
Copy link
Member

Ah yeah could the rustfmt bits be backed out for now?

Also, can you be sure to add a test for this as well?

@bors
Copy link
Contributor

bors commented Jul 5, 2016

☔ The latest upstream changes (presumably #2759) made this pull request unmergeable. Please resolve the merge conflicts.

@bennofs
Copy link
Contributor Author

bennofs commented Jul 5, 2016

Added tests and removed rustfmt changes, currently validating rebase onto updated master.

Previously, cargo package did not do anything if a tarball already
existed. This is wrong, because the source may have changed and cargo
does not do any dependency tracking for package tarballs yet, so it did
not notice this.

This commit changes cargo package to always overwrite existing tarballs,
which works fine until proper dependency tracking is implemented.

Fixes #2799
@bennofs
Copy link
Contributor Author

bennofs commented Jul 6, 2016

Ok, should be good to merge now.

@alexcrichton
Copy link
Member

@bors: r+ 18bf06d

Thanks!

@bors
Copy link
Contributor

bors commented Jul 6, 2016

⌛ Testing commit 18bf06d with merge af5dd4f...

bors added a commit that referenced this pull request Jul 6, 2016
cargo package: overwrite existing tarballs

Previously, cargo package did not do anything if a tarball already
existed. This is wrong, because the source may have changed and cargo
does not do any dependency tracking for package tarballs yet, so it did
not notice this.

This commit changes cargo package to always overwrite existing tarballs,
which works fine until proper dependency tracking is implemented.

Fixes #2799
@bors
Copy link
Contributor

bors commented Jul 6, 2016

☀️ Test successful - cargo-cross-linux, cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-gnu-32, cargo-win-gnu-64, cargo-win-msvc-32, cargo-win-msvc-64
Approved by: alexcrichton
Pushing af5dd4f to master...

@bors bors merged commit 18bf06d into rust-lang:master Jul 6, 2016
@bennofs bennofs deleted the cargo-repackage branch July 6, 2016 08:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants