attempt-backport: check existing labels before updating

nodejs · Dec 14, 2016 · e25c998 · e25c998
1 parent 831e569
commit e25c998
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/node-repo.js b/lib/node-repo.js
@@ -180,7 +180,7 @@ function stringsInCommon (arr1, arr2) {
 
 exports.getBotPrLabels = getBotPrLabels
 exports.removeLabelFromPR = removeLabelFromPR
-exports.updatePrWithLabels = updatePrWithLabels
+exports.fetchExistingThenUpdatePr = fetchExistingThenUpdatePr
 exports.resolveLabelsThenUpdatePr = deferredResolveLabelsThenUpdatePr
 
 // exposed for testability

diff --git a/scripts/attempt-backport.js b/scripts/attempt-backport.js
@@ -4,7 +4,7 @@ const child_process = require('child_process')
 const debug = require('debug')('attempt-backport')
 const request = require('request')
 const node_repo = require('../lib/node-repo')
-const updatePrWithLabels = node_repo.updatePrWithLabels
+const fetchExistingThenUpdatePr = node_repo.fetchExistingThenUpdatePr
 const removeLabelFromPR = node_repo.removeLabelFromPR
 const getBotPrLabels = node_repo.getBotPrLabels
 
@@ -132,7 +132,7 @@ function attemptBackport (options, version, isLTS, cb) {
       options.logger.debug(`backport to ${version} failed`)
 
       if (!isLTS) {
-        updatePrWithLabels(options, [`dont-land-on-v${version}.x`])
+        fetchExistingThenUpdatePr(options, [`dont-land-on-v${version}.x`])
       } else {
         getBotPrLabels(options, (err, ourLabels) => {
           if (err) {
@@ -223,7 +223,7 @@ function attemptBackport (options, version, isLTS, cb) {
     const cp = wrapCP('git', ['am'], { stdio: 'pipe' }, function done () {
       // Success!
       if (isLTS) {
-        updatePrWithLabels(options, [`lts-watch-v${version}.x`])
+        fetchExistingThenUpdatePr(options, [`lts-watch-v${version}.x`])
       } else {
         // TODO(Fishrock123): Re-enable this, but do a check first
         // to make sure the label was set by the bot only.