summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-07-28 14:13:56 -0400
committerHolger Levsen <holger@layer-acht.org>2016-07-28 14:13:56 -0400
commitb3238df8e33c0afd53906c6069f69b37b1a9a923 (patch)
tree0e6aff70dfe0cabef7048ac2e05e28dbfea30cfd
parenta2a59adfd7ac9047c39f563802edf8ba0cb68b82 (diff)
downloadjenkins.debian.net-b3238df8e33c0afd53906c6069f69b37b1a9a923.tar.xz
reproducible: minor nitpickings about Val's last commits
-rwxr-xr-xbin/reproducible_build.sh2
-rwxr-xr-xbin/reproducible_html_packages.py2
-rw-r--r--mustache-templates/reproducible/README12
-rw-r--r--mustache-templates/reproducible/package_navigation.mustache2
4 files changed, 15 insertions, 3 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 2bccdb54..f32fcb5d 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -543,7 +543,7 @@ get_source_package() {
fi
fi
VERSION="$(grep '^Version: ' ${SRCPACKAGE}_*.dsc| head -1 | egrep -v '(GnuPG v|GnuPG/MacGPG2)' | cut -d ' ' -f2-)"
- EVERSION="$(echo $VERSION | cut -d ':' -f2)" # EPOCH_FREE_VERSION was too long
+ EVERSION="$(echo $VERSION | cut -d ':' -f2)" # EPOCH_FREE_VERSION is too long
DBDREPORT="${SRCPACKAGE}_${EVERSION}.diffoscope.html"
DBDTXT="${SRCPACKAGE}_${EVERSION}.diffoscope.txt"
BUILDINFO="${SRCPACKAGE}_${EVERSION}_${ARCH}.buildinfo"
diff --git a/bin/reproducible_html_packages.py b/bin/reproducible_html_packages.py
index 118edb8a..fbce582d 100755
--- a/bin/reproducible_html_packages.py
+++ b/bin/reproducible_html_packages.py
@@ -118,7 +118,7 @@ def get_and_clean_dbd_links(package, eversion, suite, arch, status):
def gen_suitearch_details(package, version, suite, arch, status, spokenstatus,
build_date):
- eversion = strip_epoch(version)
+ eversion = strip_epoch(version) # epoch_free_version is too long
buildinfo_file = BUILDINFO_PATH + '/' + suite + '/' + arch + '/' + package + \
'_' + eversion + '_' + arch + '.buildinfo'
diff --git a/mustache-templates/reproducible/README b/mustache-templates/reproducible/README
new file mode 100644
index 00000000..fb314895
--- /dev/null
+++ b/mustache-templates/reproducible/README
@@ -0,0 +1,12 @@
+mustache is documented in PLEASE FIXME valerie! :)
+
+{{#foo}}
+ -> if foo is defined
+
+{{^foo}}
+ -> if foo is not defined
+
+{{#foo}}{{^bar}}
+ -> if foo is defined and bar is not defined
+
+
diff --git a/mustache-templates/reproducible/package_navigation.mustache b/mustache-templates/reproducible/package_navigation.mustache
index e90d2612..26c0228c 100644
--- a/mustache-templates/reproducible/package_navigation.mustache
+++ b/mustache-templates/reproducible/package_navigation.mustache
@@ -6,7 +6,7 @@
</a>
</h4>
{{#notes_uri}}
- <li><a href="{{notes_uri}}" title="Additional commentary on this packages unreproduciblity" target="main">notes</a></li>
+ <li><a href="{{notes_uri}}" title="Additional comments on this packages unreproduciblity" target="main">notes</a></li>
{{/notes_uri}}
{{^notes_uri}}
{{^reproducible}}