LineageOS/scripts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aosp-merger: remove merged_repos.txt early

Browse Source 
* To be able to re-run the script cleanly

Change-Id: I7eb65bc5d7265d0b4d892cb5c2921a8bec02103c
This commit is contained in:
Chirayu Desai
2022-01-11 05:10:31 +05:30
parent 8beaa422b3
commit f1363b6619
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
aosp-merger/aosp-merger.sh
View File

@@ -77,6 +77,8 @@ help_message() {
main() { main() {
if [ "$#" -eq 0 ]; then if [ "$#" -eq 0 ]; then
export MERGEDREPOS="${TOP}/merged_repos.txt" export MERGEDREPOS="${TOP}/merged_repos.txt"
# Remove any existing list of merged repos file
rm -f "${MERGEDREPOS}"
merge_aosp_forks merge_aosp_forks
read -p "Waiting for conflict resolution before squashing. Press enter when done." read -p "Waiting for conflict resolution before squashing. Press enter when done."
@@ -88,6 +90,8 @@ main() {
unset MERGEDREPOS unset MERGEDREPOS
elif [ "${1}" = "aosp" ]; then elif [ "${1}" = "aosp" ]; then
export MERGEDREPOS="${TOP}/merged_repos_aosp.txt" export MERGEDREPOS="${TOP}/merged_repos_aosp.txt"
# Remove any existing list of merged repos file
rm -f "${MERGEDREPOS}"
merge_aosp merge_aosp

3
aosp-merger/merge-aosp-forks.sh
View File

@@ -56,9 +56,6 @@ for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do
done done
echo "#### Verification complete - no uncommitted changes found ####" echo "#### Verification complete - no uncommitted changes found ####"
# Remove any existing list of merged repos file
rm -f "${MERGEDREPOS}"
# Ditch any existing staging branches (across all projects) # Ditch any existing staging branches (across all projects)
repo abandon "${STAGINGBRANCH}" repo abandon "${STAGINGBRANCH}"

3
aosp-merger/merge-aosp.sh
View File

@@ -52,9 +52,6 @@ for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do
done done
echo "#### Verification complete - no uncommitted changes found ####" echo "#### Verification complete - no uncommitted changes found ####"
# Remove any existing list of merged repos file
rm -f "${MERGEDREPOS}"
# Ditch any existing staging branches (across all projects) # Ditch any existing staging branches (across all projects)
repo abandon "${STAGINGBRANCH}" repo abandon "${STAGINGBRANCH}"