mirror of
https://github.com/certbot/certbot.git
synced 2026-08-01 18:56:55 +02:00
Merge branch 'pip8'
This commit is contained in:
+6
-7
@@ -161,20 +161,19 @@ for module in letsencrypt $subpkgs_modules ; do
|
||||
done
|
||||
deactivate
|
||||
|
||||
# pin peep hashes of the things we just built
|
||||
# pin pip hashes of the things we just built
|
||||
for pkg in acme letsencrypt letsencrypt-apache ; do
|
||||
echo
|
||||
letsencrypt-auto-source/pieces/peep.py hash dist."$version/$pkg"/*.{whl,gz}
|
||||
echo $pkg==$version
|
||||
echo $pkg==$version \\
|
||||
pip hash dist."$version/$pkg"/*.{whl,gz} | grep "^--hash" | python2 -c 'from sys import stdin; input = stdin.read(); print " ", input.replace("\n--hash", " \\\n --hash"),'
|
||||
done > /tmp/hashes.$$
|
||||
|
||||
if ! wc -l /tmp/hashes.$$ | grep -qE "^\s*12 " ; then
|
||||
echo Unexpected peep hash output
|
||||
if ! wc -l /tmp/hashes.$$ | grep -qE "^\s*9 " ; then
|
||||
echo Unexpected pip hash output
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# perform hideous surgery on requirements.txt...
|
||||
head -n -12 letsencrypt-auto-source/pieces/letsencrypt-auto-requirements.txt > /tmp/req.$$
|
||||
head -n -9 letsencrypt-auto-source/pieces/letsencrypt-auto-requirements.txt > /tmp/req.$$
|
||||
cat /tmp/hashes.$$ >> /tmp/req.$$
|
||||
cp /tmp/req.$$ letsencrypt-auto-source/pieces/letsencrypt-auto-requirements.txt
|
||||
|
||||
|
||||
Reference in New Issue
Block a user