Skip to content

Commit 2c91905

Browse files
committed
when running "dups" on a Process Management Project type, you have to start/stop the task to resolve it
1 parent a328c2d commit 2c91905

File tree

4 files changed

+11
-138
lines changed

4 files changed

+11
-138
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ src/github.com/op/
77
src/gopkg.in/
88
jira
99
jira.exe
10-
schemas/*.json
10+
schemas/*.json
11+
t/issue.props

main/main.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -376,13 +376,17 @@ Command Options:
376376
opts["resolution"] = "Duplicate"
377377
trans, err := c.ValidTransitions(args[0])
378378
if err == nil {
379-
close := trans.Find("close")
380-
if close != nil {
379+
if trans.Find("close") != nil {
381380
err = c.CmdTransition(args[0], "close")
382-
} else {
381+
} else if trans.Find("done") != nil {
383382
// for now just assume if there is no "close", then
384383
// there is a "done" state
385384
err = c.CmdTransition(args[0], "done")
385+
} else if trans.Find("start") != nil {
386+
err = c.CmdTransition(args[0], "start")
387+
if err == nil {
388+
err = c.CmdTransition(args[0], "stop")
389+
}
386390
}
387391
}
388392

@@ -435,7 +439,7 @@ Command Options:
435439
case "in-progress":
436440
requireArgs(1)
437441
setEditing(false)
438-
err = c.CmdTransition(args[0], "In Progress")
442+
err = c.CmdTransition(args[0], "Progress")
439443
case "comment":
440444
requireArgs(1)
441445
setEditing(true)

t/100basic.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export JIRA_LOG_FORMAT="%{level:-5s} %{message}"
77
PLAN 84
88

99
# cleanup from previous failed test executions
10-
$jira ls | awk -F: '{print $1}' | while read issue; do ../jira done $issue; done
10+
($jira ls | awk -F: '{print $1}' | while read issue; do ../jira done $issue; done) | sed 's/^/# CLEANUP: /g'
1111

1212
# reset login
1313
RUNS $jira logout

t/100create.t

Lines changed: 0 additions & 132 deletions
This file was deleted.

0 commit comments

Comments
 (0)