diff mbox

[cbuild2,1/4] Remove unneeded infrastructure/md5sums fragment from scripts.

Message ID 1381423216-21180-2-git-send-email-ryan.arnold@linaro.org
State New
Headers show

Commit Message

Ryan S. Arnold Oct. 10, 2013, 4:40 p.m. UTC 
From: "Ryan S. Arnold" <ryan.arnold@linaro.org>

The file, snapshots/md5sums, has the infrastructure md5sums entries in it
already so the infrastructure/ specific md5sums file is redundant.
---
 cbuild2.sh    |  2 +-
 lib/depend.sh | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/cbuild2.sh b/cbuild2.sh
index 964efea..e4ce56d 100755
--- a/cbuild2.sh
+++ b/cbuild2.sh
@@ -40,7 +40,7 @@  get_list()
 	    echo "${snapshots}"
 	    ;;
 	infrastructure|i*)
-	    infrastructure="`grep infrastructure ${local_snapshots}/infrastructure/md5sums | cut -d ' ' -f 3 | cut -d '/' -f 2`"
+	    infrastructure="`grep infrastructure ${local_snapshots}/md5sums | cut -d ' ' -f 3 | cut -d '/' -f 2`"
 	    echo "${infrastructure}"
 	    ;;
     esac
diff --git a/lib/depend.sh b/lib/depend.sh
index cd326ce..847ede2 100755
--- a/lib/depend.sh
+++ b/lib/depend.sh
@@ -158,8 +158,6 @@  infrastructure()
 {
     trace "$*"
 
-    rm -f ${local_snapshots}/infrastructure/md5sums
-    fetch_http infrastructure/md5sums
     rm -f ${local_snapshots}/infrastructure/ChangeLog
     fetch_http infrastructure/ChangeLog
 
@@ -169,7 +167,13 @@  infrastructure()
 	error "No dependencies listed for infrastructure libraries!"
 	return 1
     fi
-    
+
+    # This shouldn't happen, but it's nice for regression verification.
+    if test ! -e ${local_snapshots}/md5sums; then
+	error "Missing ${local_snapshots}/md5sums file needed for infrastructure libraries."
+	return 1
+    fi
+   
     # We have to grep each dependency separately to preserve the order, as
     # some libraries depend on other libraries being bult first. Egrep
     # unfortunately sorts the files, which screws up the order.