mirror of
https://github.com/certbot/certbot.git
synced 2026-08-01 19:14:54 +02:00
Do not unstage generated cffi augeas (#8094)
This line seems to refer to [augeas.py](https://github.com/hercules-team/python-augeas/blob/v0.5.0/augeas.py) from the version of Augeas we normally have pinned. This was necessary when we were installing each Certbot component in separate parts and only combining them later to ensure that the Augeas fork (which uses cffi) was used instead of the unmodified pinned version of Augeas. Since everything is installed in one part and we're removing the Augeas pinning now though, this line is no longer necessary. You can see the snap being built and tested successfully with this change at https://travis-ci.com/github/certbot/certbot/builds/172134518. * Do not unstage generated cffi augeas * Add comment about deleted line.
This commit is contained in:
+7
-2
@@ -49,8 +49,13 @@ parts:
|
||||
- ./certbot-nginx
|
||||
stage:
|
||||
- -usr/lib/python3.8/sitecustomize.py # maybe unnecessary
|
||||
# Prefer cffi
|
||||
- -lib/python3.8/site-packages/augeas.py
|
||||
# Old versions of this file used to unstage
|
||||
# lib/python3.8/site-packages/augeas.py to avoid conflicts between
|
||||
# python-augeas 0.5.0 which was pinned in snap-constraints.txt and
|
||||
# Robie's python-augeas fork which creates an auto-generated cffi file at
|
||||
# the same path. Since we've combined things in one part and removed the
|
||||
# python-augeas pinning, unstaging this file had a different, unintended
|
||||
# effect so we now stage the file to keep the auto-generated cffi file.
|
||||
stage-packages:
|
||||
- libaugeas0
|
||||
# added to stage python:
|
||||
|
||||
Reference in New Issue
Block a user