X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=darcs-all;h=72aff5476fce44ac55a4bac230326b5a285aa594;hp=963dfa3b0110d747e51fc1d4a4457773235a99a6;hb=294dab1b04599cd7628642b0fe02e088ac3da4ba;hpb=2936ede28758713e2b32fad5749c622fdaaefd8e

diff --git a/darcs-all b/darcs-all
index 963dfa3..72aff54 100644
--- a/darcs-all
+++ b/darcs-all
@@ -22,6 +22,24 @@ use strict;
 #      ./darc-all push --dry-run
 #          To see what local patches you have relative to the main repos
 #
+# -------------- Flags -------------------
+#   -q says to be quite, and -s to be silent.
+#
+#   -i says to ignore darcs errors and move on to the next repository
+#
+#   -r repo says to use repo as the location of package repositories
+#
+#   --checked-out says that the remote repo is in checked-out layout, as
+#   opposed to the layout used for the main repo.  By default a repo on
+#   the local filesystem is assumed to be checked-out, and repos accessed
+#   via HTTP or SSH are assumed to be in the main repo layout; use
+#   --checked-out to override the latter.
+#
+#   --nofib, --testsuite also get the nofib and testsuite repos respectively
+#
+#   The darcs get flag you are most likely to want is --complete. By
+#   default we pass darcs the --partial flag.
+#
 # ------------ Which repos to use -------------
 # darcs-all uses the following algorithm to decide which remote repos to use
 #
@@ -52,24 +70,6 @@ use strict;
 # root one.  So the remote repos must be laid out in one of the two
 # formats given by <local-path> and <remote-path> in the file 'packages'.
 
-# -------------- Flags -------------------
-#   -q says to be quite, and -s to be silent.
-#
-#   -i says to ignore darcs errors and move on to the next repository
-#
-#   -r repo says to use repo as the location of package repositories
-#
-#   --checked-out says that the remote repo is in checked-out layout, as
-#   opposed to the layout used for the main repo.  By default a repo on
-#   the local filesystem is assumed to be checked-out, and repos accessed
-#   via HTTP or SSH are assumed to be in the main repo layout; use
-#   --checked-out to override the latter.
-#
-#   --nofib, --testsuite also get the nofib and testsuite repos respectively
-#
-#   The darcs get flag you are most likely to want is --complete. By
-#   default we pass darcs the --partial flag.
-#
 
 $| = 1; # autoflush stdout after each print, to avoid output after die
 
@@ -322,6 +322,8 @@ sub main {
 }
 
 END {
+    my $ec = $?;
+
     message "== Checking for old bytestring repo";
     if (-d "libraries/bytestring/_darcs") {
         if ((system "darcs annotate --repodir libraries/bytestring --match 'hash 20080118173113-3fd76-d5b74c04372a297b585ebea4e16d524551ce5035' > /dev/null 2> /dev/null") == 0) {
@@ -338,6 +340,20 @@ EOF
         }
     }
 
+    message "== Checking for bytestring tarball";
+    if (-d "libraries/bytestring" && not -d "libraries/bytestring/_darcs") {
+        print <<EOF;
+============================
+ATTENTION!
+
+You have an old bytestring in your GHC tree!
+
+Please remove it (e.g. "rm -r libraries/bytestring"), and then run
+"./darcs-all get" to get the darcs repository.
+============================
+EOF
+    }
+
     message "== Checking for unpulled tarball patches";
     if ((system "darcs annotate --match 'hash 20090930200358-3fd76-cab3bf4a0a9e3902eb6dd41f71712ad3a6a9bcd1' > /dev/null 2> /dev/null") == 0) {
         print <<EOF;
@@ -352,6 +368,8 @@ and say yes to each patch.
 ============================
 EOF
     }
+
+    $? = $ec;
 }
 
 main(@ARGV);