---

yaml
---
r: 109341
b: refs/heads/dist-snap
c: cc5fae7
h: refs/heads/master
i:
  109339: e7991b7
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 8694c287628a2bcb1af2ba30bf778bfdd9ad0091
+refs/heads/dist-snap: cc5fae720a4dbc02891ce55c87754d499d66ddfc
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/etc/install.sh

@@ -237,6 +237,7 @@ need_ok "failed to remove install probe"
 "${CFG_SRC_DIR}/bin/rustc" --version > /dev/null
 need_ok "can't run these binaries on this platform"
 
+
 # First, uninstall from the installation prefix
 # FIXME: Hardcoded 'rustlib' ignores CFG_RUSTLIBDIR
 if [ -f "${CFG_PREFIX}/lib/rustlib/manifest" ]
@@ -251,6 +252,12 @@ then
     msg "uninstall ${CFG_PREFIX}/lib/rustlib"
     rm -r "${CFG_PREFIX}/lib/rustlib"
     need_ok "failed to remove rustlib"
+else
+    if [ -n "${CFG_UNINSTALL}" ]
+    then
+        err "unable to find manifest at ${CFG_PREFIX}/lib/rustlib"
+        exit 0
+    fi
 fi
 
 # If we're only uninstalling then exit