From cfd4d88a20ffa2b625b37e01f435cd03f860723c Mon Sep 17 00:00:00 2001
From: Victor Hu <vhu@us.ibm.com>
Date: Tue, 23 Jun 2015 10:23:44 -0400
Subject: [PATCH] The cleanupg changlog code was in the wrong section, fixed
 issues after testing on the official build machine

---
 build-ubunturepo | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/build-ubunturepo b/build-ubunturepo
index 306844919..e9cb21312 100755
--- a/build-ubunturepo
+++ b/build-ubunturepo
@@ -344,6 +344,18 @@ __EOF__
         ln -s xcat-core core-snap
     fi
 
+    #
+    # remove the changes to changelog since the files get changed and created in xcat-core..
+    # left over files not commited to git will prevent switching from branch to branch ...
+    echo "Cleaning up modified changelog files..."
+    cleanup_oldpwd=`pwd`
+    # go to the xcat-core git repo directory 
+    #
+    cd $local_core_repo_path
+    cd ../xcatbuild/xcat-core
+    find ./ -name "changelog" -print | xargs git checkout
+    cd $cleanup_oldpwd
+
     # Decide whether to upload or not
     if [ -n "$UP" ] && [ "$UP" == 0 ]; then
         echo "No need to upload"