From 06bcb50a5f86d8e8824eb8f5c92ee1bbdc7454a8 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sun, 4 May 2014 22:30:08 -0700
Subject: [PATCH] fix(tag_release): Finish partially completed flag rename.

Didn't quite complete all the renames in 10d98e7, breaking everything...
---
 tag_release | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tag_release b/tag_release
index 7427531c22..fdc1840178 100755
--- a/tag_release
+++ b/tag_release
@@ -17,7 +17,7 @@ if [[ ${DEFAULT_MAJOR} -eq ${CURRENT_VERSION[0]} ]]; then
 fi
 
 DEFINE_integer major ${DEFAULT_MAJOR} "Branch major version (aka 'build')"
-DEFINE_integer branch ${DEFAULT_MINOR} "Branch revision or minor version"
+DEFINE_integer minor ${DEFAULT_MINOR} "Branch revision or minor version"
 DEFINE_integer patch 0 "Branch patch id, normally 0"
 DEFINE_string track "dev-channel" "Set the given track to this new branch"
 DEFINE_string sdk_version "${COREOS_VERSION_ID}" \
@@ -30,8 +30,8 @@ FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 switch_to_strict_mode
 
-BRANCH_NAME="build-${FLAGS_build}"
-BRANCH_VERSION="${FLAGS_build}.${FLAGS_branch}.${FLAGS_patch}"
+BRANCH_NAME="build-${FLAGS_major}"
+BRANCH_VERSION="${FLAGS_major}.${FLAGS_minor}.${FLAGS_patch}"
 TAG_NAME="v${BRANCH_VERSION}"
 
 if [[ "${FLAGS_sdk_version}" == keep || "${FLAGS_sdk_version}" == current ]]
@@ -58,8 +58,8 @@ fi
 
 repo manifest -o "${BRANCH_NAME}.xml" -r
 tee version.txt <<EOF
-COREOS_BUILD=${FLAGS_build}
-COREOS_BRANCH=${FLAGS_branch}
+COREOS_BUILD=${FLAGS_major}
+COREOS_BRANCH=${FLAGS_minor}
 COREOS_PATCH=${FLAGS_patch}
 COREOS_VERSION=${BRANCH_VERSION}
 COREOS_VERSION_ID=${BRANCH_VERSION}