make: Fix "gbp import-orig" call for -pristine-tar=true

so that the pristine-tar branch is actually created when requested.

Author: anthonyfok

make.go

@@ -295,7 +295,7 @@ func runGitCommandIn(dir string, arg ...string) error {
 	return cmd.Run()
 }
 
-func createGitRepository(debsrc, gopkg, orig string, dep14 bool) (string, error) {
+func createGitRepository(debsrc, gopkg, orig string, dep14, pristineTar bool) (string, error) {
 	wd, err := os.Getwd()
 	if err != nil {
 		return "", err
@@ -315,36 +315,39 @@ func createGitRepository(debsrc, gopkg, orig string, dep14 bool) (string, error)
 		}
 	}
 
+	// Set repository options
+
 	if debianName := getDebianName(); debianName != "TODO" {
 		if err := runGitCommandIn(dir, "config", "user.name", debianName); err != nil {
 			return dir, err
 		}
 	}
-
 	if debianEmail := getDebianEmail(); debianEmail != "TODO" {
 		if err := runGitCommandIn(dir, "config", "user.email", debianEmail); err != nil {
 			return dir, err
 		}
 	}
-
 	if err := runGitCommandIn(dir, "config", "push.default", "matching"); err != nil {
 		return dir, err
 	}
-
 	if err := runGitCommandIn(dir, "config", "--add", "remote.origin.push", "+refs/heads/*:refs/heads/*"); err != nil {
 		return dir, err
 	}
-
 	if err := runGitCommandIn(dir, "config", "--add", "remote.origin.push", "+refs/tags/*:refs/tags/*"); err != nil {
 		return dir, err
 	}
 
-	var cmd *exec.Cmd
+	// Import upstream orig tarball
+
+	arg := []string{"import-orig", "--no-interactive"}
 	if dep14 {
-		cmd = exec.Command("gbp", "import-orig", "--debian-branch=debian/sid", "--no-interactive", filepath.Join(wd, orig))
-	} else {
-		cmd = exec.Command("gbp", "import-orig", "--no-interactive", filepath.Join(wd, orig))
+		arg = append(arg, "--debian-branch=debian/sid")
+	}
+	if pristineTar {
+		arg = append(arg, "--pristine-tar")
 	}
+	arg = append(arg, filepath.Join(wd, orig))
+	cmd := exec.Command("gbp", arg...)
 	cmd.Dir = dir
 	cmd.Stderr = os.Stderr
 	if err := cmd.Run(); err != nil {
@@ -758,7 +761,7 @@ func execMake(args []string, usage func()) {
 
 	debversion := u.version + "-1"
 
-	dir, err := createGitRepository(debsrc, gopkg, orig, dep14)
+	dir, err := createGitRepository(debsrc, gopkg, orig, dep14, pristineTar)
 	if err != nil {
 		log.Fatalf("Could not create git repository: %v\n", err)
 	}