Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert commit 4615c0b, the documentation date is now the date when it…

… is really generated
  • Loading branch information...
commit 8de69dafe31324e77cdb0282b1a979671f32d3dc 1 parent 77829af
@cbonte authored
Showing with 3 additions and 22 deletions.
  1. +3 −22 haproxy-dconv.py
View
25 haproxy-dconv.py
@@ -38,15 +38,13 @@
from parser import *
VERSION = ""
-DATE = ""
HAPROXY_GIT_VERSION = False
def main():
- global VERSION, DATE, HAPROXY_GIT_VERSION
+ global VERSION, HAPROXY_GIT_VERSION
VERSION = get_git_version()
- DATE = get_git_date()
- if not VERSION or not DATE:
+ if not VERSION:
sys.exit(1)
usage="Usage: %prog --infile <infile> --outfile <outfile>"
@@ -89,23 +87,6 @@ def get_git_version():
version = version[1:].strip()
return version
-# Temporarily determine the last commit date from git
-def get_git_date():
- if not os.path.isdir(".git"):
- print >> sys.stderr, "This does not appear to be a Git repository."
- return
- try:
- p = subprocess.Popen(["git", "log", "-1", '--format=%ct'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- except EnvironmentError:
- print >> sys.stderr, "Unable to run git"
- return
- date = p.communicate()[0]
- if p.returncode != 0:
- print >> sys.stderr, "Unable to run git"
- return
-
- return date
-
def get_haproxy_git_version(path):
try:
p = subprocess.Popen(["git", "describe", "--tags", "--match", "v*"], cwd=path, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -434,7 +415,7 @@ def convert(infile, outfile):
keywordsCount = keywordsCount,
keyword_conflicts = keyword_conflicts,
version = VERSION,
- date = datetime.datetime.fromtimestamp(int(DATE)).strftime("%Y/%m/%d")
+ date = datetime.datetime.now().strftime("%Y/%m/%d")
)
fd.close()
Please sign in to comment.
Something went wrong with that request. Please try again.