Skip to content

E
etersoft-build-utils
Commit b5e0612d authored by Boris Yumankulov's avatar Boris Yumankulov Committed by Vitaly Lipatov
Browse files
Options

rpmgs: use Cargo.toml for detect rust vendor

Signed-off-by: 's avatarBoris Yumankulov <boria138@altlinux.org>
parent afca0560
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
bin/rpmgs
View file @ b5e0612d
...@@ -613,13 +613,13 @@ update_predownloaded() ...@@ -613,13 +613,13 @@ update_predownloaded()
#### cargo only part #### cargo only part
if [ -s "./Cargo.lock" ] && [ ! -d "./vendor" ] ; then if [ -s "./Cargo.toml" ] && [ ! -d "./vendor" ] ; then
local COMMITMSG='' local COMMITMSG=''
local PRODUCTION='' local PRODUCTION=''
#[ "$MODE" = "production" ] && PRODUCTION='--no-dev' #[ "$MODE" = "production" ] && PRODUCTION='--no-dev'
info "Detected 'Cargo.lock' install hook ..." info "Detected 'Cargo.toml' install hook ..."
docmd cargo vendor --verbose $PRODUCTION || fatal docmd cargo vendor --verbose $PRODUCTION || fatal
COMMITMSG="update vendored cargo modules with cargo vendor $PRODUCTION for $VERSION (see $SDNAME in .gear/rules)" COMMITMSG="update vendored cargo modules with cargo vendor $PRODUCTION for $VERSION (see $SDNAME in .gear/rules)"
...@@ -639,7 +639,7 @@ update_predownloaded() ...@@ -639,7 +639,7 @@ update_predownloaded()
rm -rv vendor/windows*/lib/{*.lib,*.a} rm -rv vendor/windows*/lib/{*.lib,*.a}
HAS_CARGO=1 HAS_CARGO=1
KEEP_DIRS="$KEEP_DIRS vendor Cargo.lock" KEEP_DIRS="$KEEP_DIRS vendor Cargo.toml"
fi fi
local i local i
......
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