Skip to content

fix conflict as described in issue #23 #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tlkahn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix conflict as described in issue #23 #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions dashing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func commands() []cli.Command {
{
Name: "version",
Usage: "Print version and exit.",
Action: func(c *cli.Context) { fmt.Println(version) },
Action: func(c *cli.Context) error { fmt.Println(version);return nil },
Flags: []cli.Flag{
cli.StringFlag{
Name: "config, f",
Expand All @@ -139,7 +139,7 @@ func commands() []cli.Command {
}
}

func create(c *cli.Context) {
func create(c *cli.Context) error {
f := c.String("config")
if len(f) == 0 {
f = "dashing.json"
Expand All @@ -164,10 +164,10 @@ func create(c *cli.Context) {
os.Exit(1)
}
fmt.Printf("You may now edit %s", f)

return nil
}

func build(c *cli.Context) {
func build(c *cli.Context) error {
var dashing Dashing

source_depth := 0
Expand Down Expand Up @@ -212,10 +212,11 @@ func build(c *cli.Context) {
db, err := createDB(name)
if err != nil {
fmt.Printf("Failed to create database: %s\n", err)
return
return nil
}
defer db.Close()
texasRanger(source, source_depth, name, dashing, db)
return nil
}

func decodeSelectField(d *Dashing) error {
Expand Down Expand Up @@ -259,6 +260,7 @@ func decodeSelectField(d *Dashing) error {
}
} else {
fmt.Errorf("Expected string or map. Kind is %s.", rv.Kind().String())
return nil
}
d.selectors[sel] = trans
}
Expand Down