rpmgs: capture cargo vendor source override config to .gear/config.toml

cargo vendor outputs a TOML config block to stdout with [source.*] overrides matching the actual git revisions / source IDs of vendored deps (including ?rev=... keys for git-pinned dependencies). This output was previously discarded, leaving package authors to maintain .gear/config.toml manually — which silently goes stale when upstream updates a git rev pin and breaks offline builds. Now rpmgs redirects the stdout to $RGD/.gear/config.toml during update_predownloaded() and stages it alongside the vendor commit, so the source override always matches the vendored crates.

rpmgs: capture cargo vendor source override config to .gear/config.toml
ee24ccf1 · Vitaly Lipatov · fbb45e7f · ee24ccf1
Commit ee24ccf1 authored May 06, 2026 by Vitaly Lipatov
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

rpmgs bin/rpmgs +10 -4

No files found.
--- a/bin/rpmgs
+++ b/bin/rpmgs
@@ -660,7 +660,9 @@ update_predownloaded()
 		#[ "$MODE" = "production" ] && PRODUCTION='--no-dev'

 		info "Detected 'Cargo.toml' install hook ..."
-		docmd cargo vendor --verbose $PRODUCTION || fatal
+		showcmd cargo vendor $PRODUCTION '>' $RGD/.gear/config.toml
+		a= cargo vendor $PRODUCTION > $RGD/.gear/config.toml || fatal
+		info "Cargo vendor source override saved to .gear/config.toml"
 		COMMITMSG="update vendored cargo modules with cargo vendor $PRODUCTION for $VERSION (see $SDNAME in .gear/rules)"

 		if [ -s $RGD/.gear/predownloaded-postinstall-hook ] ; then
@@ -679,7 +681,7 @@ update_predownloaded()
 		rm -rv vendor/windows*/lib/{*.lib,*.a}

 		HAS_CARGO=1
-		KEEP_DIRS="$KEEP_DIRS vendor Cargo.toml"
+		KEEP_DIRS="$KEEP_DIRS vendor Cargo.toml config.toml"
 	fi

 	local i
@@ -698,7 +700,9 @@ update_predownloaded()

 		info "Detected '$i' install hook ..."
 		cd $rust_dir || fatal
-		docmd cargo vendor --verbose $vendor_rel || fatal
+		showcmd cargo vendor $vendor_rel '>' $RGD/.gear/config.toml
+		a= cargo vendor $vendor_rel > $RGD/.gear/config.toml || fatal
+		info "Cargo vendor source override saved to .gear/config.toml"
 		COMMITMSG="update vendored cargo modules in $rust_dir dir with cargo vendor for $VERSION (see $SDNAME in .gear/rules)"

 		if [ -s $RGD/.gear/predownloaded-postinstall-hook ] ; then
@@ -712,7 +716,7 @@ update_predownloaded()
 		rm -rv vendor/winapi-*-pc-windows-gnu/lib/*.a

 		HAS_CARGO=1
-		KEEP_DIRS="$KEEP_DIRS vendor Cargo.lock"
+		KEEP_DIRS="$KEEP_DIRS vendor Cargo.lock config.toml"
 	done
 	#### end of cargo only part

@@ -944,6 +948,8 @@ update_predownloaded()
 	popd

 	docmd git add -f $PSM
+	# also stage cargo source-override config if rpmgs generated it
+	[ -n "$HAS_CARGO" ] && [ -f "$RGD/.gear/config.toml" ] && docmd git -C "$RGD" add -f .gear/config.toml
 	docmd git commit -m "$COMMITMSG"

 }