Merge pull request #724 from pachyderm/fix_pretest

Fixes make pretest
pachyderm · Aug 17, 2016 · 51ab58e · 51ab58e
2 parents 7aa2f20 + 1936c5f
commit 51ab58e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/server/pfs/drive/driver.go b/src/server/pfs/drive/driver.go
@@ -1503,10 +1503,10 @@ func validateRepoName(name string) error {
 		return fmt.Errorf("repo name (%v) invalid: only alphanumeric and underscore characters allowed", name)
 	}
 	if strings.Contains(name, "/") {
-		fmt.Errorf("repo names cannot contain /")
+		return fmt.Errorf("repo names cannot contain /")
 	}
 	if client.ReservedRepoNames[name] {
-		fmt.Errorf("repo name %s is a reserved keyword")
+		return fmt.Errorf("repo name %s is a reserved keyword", name)
 	}
 	return nil
 }
diff --git a/src/server/pps/server/api_server.go b/src/server/pps/server/api_server.go
@@ -188,7 +188,7 @@ func (a *apiServer) CreateJob(ctx context.Context, request *ppsclient.CreateJobR
 		})
 		if err == nil {
 			// the job already exists. we simply return
-			return &ppsclient.Job{jobID}, nil
+			return &ppsclient.Job{ID: jobID}, nil
 		}
 	}