Merge branch 'master' into feature_skip_existing_packages_latest

aptly-dev · Mar 25, 2017 · 9978595 · 9978595
2 parents aa16899 + 91219e3
commit 9978595
Show file tree

Hide file tree

Showing 4 changed files with 202 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,7 +30,6 @@ coverage*.out
 xc-out/
 root/
 
-gen
 man/aptly.1.html
 man/aptly.1.ronn
 

diff --git a/man/gen.go → _man/gen.go b/man/gen.go → _man/gen.go
@@ -7,7 +7,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"text/template"
 
@@ -56,8 +55,7 @@ func main() {
 	command.UsageLine = "aptly"
 	command.Dispatch(nil)
 
-	_, _File, _, _ := runtime.Caller(0)
-	_File, _ = filepath.Abs(_File)
+	_File, _ := filepath.Abs("./man")
 
 	templ := template.New("man").Funcs(template.FuncMap{
 		"allFlags":    allFlags,

diff --git a/man/Makefile b/man/Makefile
@@ -5,6 +5,6 @@ prepare:
 	gem specific_install -l smira/ronn
 
 generate:
-	go run gen.go
+	go run ../_man/gen.go
 
 .PHONY: prepare generate
diff --git a/vendor/github.com/aws/aws-sdk-go/awsmigrate/awsmigrate-renamer/gen/gen.go b/vendor/github.com/aws/aws-sdk-go/awsmigrate/awsmigrate-renamer/gen/gen.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ coverage*.out @@
     xc-out/
     root/
-    gen
     man/aptly.1.html
     man/aptly.1.ronn
@@ Expand Down @@