Skip to content

Commit 77d5e70

Browse files
committed
---
yaml --- r: 106260 b: refs/heads/auto c: cc5fae7 h: refs/heads/master v: v3
1 parent da8d8d4 commit 77d5e70

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 8694c287628a2bcb1af2ba30bf778bfdd9ad0091
16+
refs/heads/auto: cc5fae720a4dbc02891ce55c87754d499d66ddfc
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/etc/install.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ need_ok "failed to remove install probe"
237237
"${CFG_SRC_DIR}/bin/rustc" --version > /dev/null
238238
need_ok "can't run these binaries on this platform"
239239

240+
240241
# First, uninstall from the installation prefix
241242
# FIXME: Hardcoded 'rustlib' ignores CFG_RUSTLIBDIR
242243
if [ -f "${CFG_PREFIX}/lib/rustlib/manifest" ]
@@ -251,6 +252,12 @@ then
251252
msg "uninstall ${CFG_PREFIX}/lib/rustlib"
252253
rm -r "${CFG_PREFIX}/lib/rustlib"
253254
need_ok "failed to remove rustlib"
255+
else
256+
if [ -n "${CFG_UNINSTALL}" ]
257+
then
258+
err "unable to find manifest at ${CFG_PREFIX}/lib/rustlib"
259+
exit 0
260+
fi
254261
fi
255262

256263
# If we're only uninstalling then exit

0 commit comments

Comments
 (0)