Commit 4b576729 authored by Ximin Luo's avatar Ximin Luo

update debcargo, cargo-metadata, cargo-vendor, cargo-lichking

parent 1cf5295a
rust-cargo-lichking (0.8.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
* Team upload.
* Package cargo-lichking 0.8.0 from crates.io using debcargo 2.3.0
-- Ximin Luo <infinity0@debian.org> Fri, 31 May 2019 01:13:02 -0700
rust-cargo-lichking (0.7.0-1) unstable; urgency=medium
* Package cargo-lichking 0.7.0 from crates.io using debcargo 2.2.9
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Index: cargo-lichking/Cargo.toml
===================================================================
--- cargo-lichking.orig/Cargo.toml
+++ cargo-lichking/Cargo.toml
@@ -20,7 +20,7 @@ keywords = ["cargo", "licensing"]
license = "MIT/Apache-2.0"
repository = "https://github.com/Nemo157/cargo-lichking"
[dependencies.cargo]
-version = "0.31"
+version = "0.32"
[dependencies.clap]
version = "2.20"
Index: cargo-lichking/src/load.rs
===================================================================
--- cargo-lichking.orig/src/load.rs
+++ cargo-lichking/src/load.rs
@@ -24,7 +24,7 @@ pub fn resolve_roots(
SelectedPackage::Specific(spec) => {
let (packages, _) = ops::resolve_ws(&workspace)?;
let package_id = spec.query(packages.package_ids())?;
- vec![packages.get(package_id)?.clone()]
+ vec![packages.get_one(package_id)?.clone()]
}
})
}
@@ -40,7 +40,7 @@ pub fn resolve_packages<'a, I: IntoItera
let mut result = HashSet::new();
let mut to_check = roots.into_iter().map(|p| p.package_id()).collect::<Vec<_>>();
while let Some(id) = to_check.pop() {
- if let Ok(package) = packages.get(id) {
+ if let Ok(package) = packages.get_one(id) {
if result.insert(package) {
let deps = resolve.deps_not_replaced(id);
for dep_id in deps {
Index: cargo-lichking/Cargo.toml
===================================================================
--- cargo-lichking.orig/Cargo.toml
+++ cargo-lichking/Cargo.toml
@@ -29,7 +29,7 @@ version = "2.20"
version = "0.1.2"
[dependencies.regex]
-version = "0.2"
+version = "1"
[dependencies.void]
version = "1.0"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@
license = "MIT/Apache-2.0"
repository = "https://github.com/Nemo157/cargo-lichking"
[dependencies.cargo]
-version = "0.32"
+version = ">= 0.32, < 0.36"
[dependencies.clap]
version = "2.20"
cargo-0.32.patch
regex-1.patch
relax-dep-versions.patch
rust-cargo-metadata (0.8.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
* Team upload.
* Package cargo_metadata 0.8.0 from crates.io using debcargo 2.3.0
-- Ximin Luo <infinity0@debian.org> Fri, 31 May 2019 01:08:18 -0700
rust-cargo-metadata (0.6.4-1) unstable; urgency=medium
* Team upload.
......
......@@ -14,8 +14,8 @@ Comment:
Files: debian/*
Copyright:
2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
2018 Matt Kraai <kraai@debian.org>
2018-2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
2018-2019 Matt Kraai <kraai@debian.org>
License: MIT
License: MIT
......
rust-cargo-vendor (0.1.23-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
* Package cargo-vendor 0.1.23 from crates.io using debcargo 2.3.0
-- Ximin Luo <infinity0@debian.org> Fri, 31 May 2019 01:08:23 -0700
rust-cargo-vendor (0.1.22-1) unstable; urgency=medium
* Package cargo-vendor 0.1.22 from crates.io using debcargo 2.2.9
......
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@
license = "MIT/Apache-2.0"
repository = "https://github.com/alexcrichton/cargo-vendor"
[dependencies.cargo]
-version = "0.33"
+version = ">= 0.33, < 0.36"
[dependencies.docopt]
version = "1.0.2"
relax-dep-versions.patch
update-dep-cargo.patch
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,7 +17,6 @@
use std::path::{PathBuf, Path};
use cargo::core::{Workspace, GitReference, SourceId, enable_nightly_features};
-use cargo::CliResult;
use cargo::util::{Config, CargoResult, CargoResultExt};
use cargo::util::Sha256;
use docopt::Docopt;
@@ -123,11 +122,11 @@
.unwrap_or_else(|e| e.exit());
let result = real_main(options, &mut config);
if let Err(e) = result {
- cargo::exit_with_error(e, &mut *config.shell());
+ cargo::exit_with_error(e.into(), &mut *config.shell());
}
}
-fn real_main(options: Options, config: &mut Config) -> CliResult {
+fn real_main(options: Options, config: &mut Config) -> CargoResult<()> {
if options.flag_version {
println!("{} {}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"));
return Ok(());
@@ -158,13 +157,11 @@
fs::create_dir_all(&path).chain_err(|| {
format!("failed to create: `{}`", path.display())
- }).map_err(|e| cargo::CargoError::from(e))?;
+ })?;
if !is_multi_sources && options.flag_no_merge_sources {
- let mut file = File::create(sources_file)
- .map_err(|e| cargo::CargoError::from(e))?;
- file.write_all(json!([]).to_string().as_bytes())
- .map_err(|e| cargo::CargoError::from(e))?;
+ let mut file = File::create(sources_file)?;
+ file.write_all(json!([]).to_string().as_bytes())?;
}
let workspaces = match options.flag_sync {
@@ -197,7 +194,7 @@
!options.flag_no_merge_sources,
).chain_err(|| {
format!("failed to sync")
- }).map_err(|e| cargo::CargoError::from(e))?;
+ })?;
if !options.flag_quiet.unwrap_or(false) {
eprint!("To use vendored sources, add this to your .cargo/config for this project:\n\n");
@@ -252,6 +249,8 @@
}
}
+ let mut checksums = HashMap::new();
+
for ws in workspaces {
let (packages, resolve) = cargo::ops::resolve_ws(&ws).chain_err(|| {
"failed to load pkg lockfile"
@@ -271,6 +270,8 @@
ids.insert(pkg.clone(), packages.get_one(pkg).chain_err(|| {
"failed to fetch package"
})?.clone());
+
+ checksums.insert(pkg.clone(), resolve.checksums().get(&pkg).cloned());
}
}
@@ -357,7 +358,7 @@
if sources.insert(id.source_id()) && !merge_sources {
fs::create_dir_all(&source_dir).chain_err(|| {
format!("failed to create: `{}`", source_dir.display())
- }).map_err(|e| cargo::CargoError::from(e))?;
+ })?;
}
let dst = source_dir.join(&dst_name);
added_crates.push(dst.clone());
@@ -381,7 +382,7 @@
// Finally, emit the metadata about this package
let json = json!({
- "package": pkg.summary().checksum(),
+ "package": checksums.get(id),
"files": map,
});
rust-debcargo (2.2.10-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
rust-debcargo (2.3.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
* Package debcargo 2.2.10 from crates.io using debcargo 2.2.10
* Package debcargo 2.3.0 from crates.io using debcargo 2.3.0
-- Ximin Luo <infinity0@debian.org> Sat, 16 Mar 2019 14:55:04 -0700
-- Ximin Luo <infinity0@debian.org> Fri, 31 May 2019 01:08:10 -0700
rust-debcargo (2.2.10-1) unstable; urgency=medium
......
......@@ -37,6 +37,7 @@ dcver=$($DEBCARGO --version | sed -ne 's/debcargo //p')
case $dcver in
2.0.*|2.1.*|2.2.[0123456789]|2.2.[0123456789]-*) abort 1 "unsupported debcargo version $dcver. try reinstalling with \`cargo install debcargo --force\`";;
2.2.*) true;;
2.3.*) true;;
*) abort 1 "unsupported debcargo version: $dcver";;
esac
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment