Do not error on removing files which do not exist

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
epel9
Igor Gnatenko 6 years ago
parent 60f3d8f016
commit e9a1f98b3d
No known key found for this signature in database
GPG Key ID: 695714BD1BBC5F4C

@ -1,4 +1,4 @@
From ccc7ed42c168675efc4b9719dad12800b92450d5 Mon Sep 17 00:00:00 2001 From 5fbb0558d401c26f04e274b6b1fc5b0ed9d6e4cd Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org> From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sat, 9 Mar 2019 22:04:49 +0100 Date: Sat, 9 Mar 2019 22:04:49 +0100
Subject: [PATCH 19/19] Do not pull optional dependencies Subject: [PATCH 19/19] Do not pull optional dependencies
@ -10,7 +10,7 @@ Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2 files changed, 11 insertions(+), 7 deletions(-) 2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/data/macros.cargo b/data/macros.cargo diff --git a/data/macros.cargo b/data/macros.cargo
index 96dc354..4e8f0c9 100644 index 96dc354..a816578 100644
--- a/data/macros.cargo --- a/data/macros.cargo
+++ b/data/macros.cargo +++ b/data/macros.cargo
@@ -2,8 +2,10 @@ @@ -2,8 +2,10 @@
@ -40,7 +40,7 @@ index 96dc354..4e8f0c9 100644
+%else \ +%else \
+ %{__cp} -a Cargo.toml.deps $REG_DIR/Cargo.toml \ + %{__cp} -a Cargo.toml.deps $REG_DIR/Cargo.toml \
%endif \ %endif \
+ %{__rm} $REG_DIR/Cargo.toml.{orig,deps} \ + %{__rm} -f $REG_DIR/Cargo.toml.{orig,deps} \
echo '{"files":{},"package":""}' > $REG_DIR/.cargo-checksum.json \ echo '{"files":{},"package":""}' > $REG_DIR/.cargo-checksum.json \
fi \ fi \
if %__cargo_is_bin; then \ if %__cargo_is_bin; then \

@ -5,7 +5,7 @@
Name: rust-packaging Name: rust-packaging
Version: 6 Version: 6
Release: 24%{?dist} Release: 25%{?dist}
Summary: RPM macros for building Rust packages on various architectures Summary: RPM macros for building Rust packages on various architectures
License: MIT License: MIT
@ -91,6 +91,9 @@ py.test-%{python3_version} -vv test.py
%{python3_sitelib}/rust2rpm/ %{python3_sitelib}/rust2rpm/
%changelog %changelog
* Sun Mar 10 2019 Igor Gnatenko <ignatnekobrain@fedoraproject.org> - 6-25
- Do not error on removing files which do not exist
* Sun Mar 10 2019 Igor Gnatenko <ignatnekobrain@fedoraproject.org> - 6-24 * Sun Mar 10 2019 Igor Gnatenko <ignatnekobrain@fedoraproject.org> - 6-24
- Escape `\n` properly in macro file - Escape `\n` properly in macro file

Loading…
Cancel
Save