/[pcsx2_0.9.7]/auto_update_from_upstream.sh
ViewVC logotype

Diff of /auto_update_from_upstream.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- auto_update_from_upstream.sh	2010/09/09 23:53:30	115
+++ auto_update_from_upstream.sh	2010/09/10 11:04:39	129
@@ -28,7 +28,7 @@
 	echo "$upstream_repository_url" > "$upstream_trunk/trunk/upstream_repository_url.txt"
 	mkdir -p "$upstream_trunk/trunk/bin"
 	echo "$PCSX2_VERSION" > "$upstream_trunk/trunk/bin/pcsx2-version.txt"
-
+	#echo "$PCSX2_REVISION_LOCAL" > "$upstream_trunk/trunk/local_repository_revision.txt"
 else
 	svn update -r "$upstream_revision" > /dev/null
 	echo
@@ -40,32 +40,43 @@
 	echo "$upstream_repository_url" > "$upstream_trunk/trunk/upstream_repository_url.txt"
 	mkdir -p "$upstream_trunk/trunk/bin"
 	echo "$PCSX2_VERSION" > "$upstream_trunk/trunk/bin/pcsx2-version.txt"
-
+	#echo "$PCSX2_REVISION_LOCAL" > "$upstream_trunk/trunk/local_repository_revision.txt"
 fi
 
 
 
 export current_downstream_revision=`cat "$downstream_export_location/trunk/upstream_repository_revision.txt"`
+export current_local_revision=`cat "$downstream_export_location/trunk/local_repository_revision.txt"`
 
 if [ "$OVERRIDE_UPDATE_NEEDED_CHECK" != "1" ] ; then
-	if [ "$current_downstream_revision" == "$upstream_revision" ] ; then
+	if [ "$current_downstream_revision" == "$PCSX2_REVISION" -a "$current_local_revision" == "$PCSX2_REVISION_LOCAL" ] ; then
 		echo "UPSTREAM REVISION: $upstream_revision"
 		echo "DOWNSTREAM REVISION: $current_downstream_revision"
+		echo "LOCAL REVISION: $current_local_revision"
 		echo
 		echo -e "\\tThere is no need to update the local repository. reason: upstream repository has not been updated."
 		echo
 		echo -e "\\tAborting update of $downstream_export_location/trunk"
 		echo
 		exit 0
-	fi
+	else
+		echo "UPSTREAM REVISION: $upstream_revision"
+		echo "DOWNSTREAM REVISION: $current_downstream_revision"
+		echo "LOCAL REVISION: $current_local_revision"		
+	fi	
 else
-	if [ "$current_downstream_revision" == "$upstream_revision" ] ; then
+	if [ "$current_downstream_revision" == "$PCSX2_REVISION" -a "$current_local_revision" == "$PCSX2_REVISION_LOCAL" ] ; then
 		echo "UPSTREAM REVISION: $upstream_revision"
 		echo "DOWNSTREAM REVISION: $current_downstream_revision"
+		echo "LOCAL REVISION: $current_local_revision"
 		echo
 		echo -e "\\tThere is no need to update the local repository. reason: upstream repository has not been updated."
 		echo
 		echo -e "\\tDetected the use of: --force-update ... forcing update ..."
+	else
+		echo "UPSTREAM REVISION: $upstream_revision"
+		echo "DOWNSTREAM REVISION: $current_downstream_revision"
+        	echo "LOCAL REVISION: $current_local_revision"
 	fi
 
 fi
@@ -93,6 +104,7 @@
 cp -f "$upstream_trunk/trunk/upstream_repository_revision.txt" "$downstream_export_location/trunk/upstream_repository_revision.txt" > /dev/null 2>/dev/null
 cp -f "$upstream_trunk/trunk/upstream_repository_url.txt" "$downstream_export_location/trunk/upstream_repository_url.txt" > /dev/null 2>/dev/null
 cp -f "$upstream_trunk/trunk/bin/pcsx2-version.txt" "$downstream_export_location/trunk/bin/pcsx2-version.txt"
+cp -f "$upstream_trunk/trunk/local_repository_revision.txt" "$downstream_export_location/trunk/local_repository_revision.txt"
 
 cd "$downstream_export_location"
 "$downstream_export_location/auto_import_3rdparty_deps.sh"

 

  ViewVC Help
Powered by ViewVC 1.1.22