Skip to content

Commit 4fb3088

Browse files
committed
---
yaml --- r: 105122 b: refs/heads/snap-stage3 c: cc5fae7 h: refs/heads/master v: v3
1 parent a4a7c6c commit 4fb3088

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
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 8694c287628a2bcb1af2ba30bf778bfdd9ad0091
4+
refs/heads/snap-stage3: cc5fae720a4dbc02891ce55c87754d499d66ddfc
55
refs/heads/try: db814977d07bd798feb24f6b74c00800ef458a13
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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)