From 5f66196b690b882cad128be237ceae66c030fa23 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Mon, 17 Aug 2020 15:47:21 -0700
Subject: [PATCH] remove python-augeas fork

---
 snap/snapcraft.yaml        | 10 +---------
 tools/snap/build_remote.py |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index c2dab9180..e7f022470 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -44,20 +44,12 @@ parts:
     source: .
     constraints: [$SNAPCRAFT_PART_SRC/snap-constraints.txt]
     python-packages:
-      - git+https://github.com/basak/python-augeas.git@snap
       - ./acme
       - ./certbot
       - ./certbot-apache
       - ./certbot-nginx
     stage:
       - -usr/lib/python3.8/sitecustomize.py # maybe unnecessary
-      # 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
       - libpython3.8-dev
@@ -80,7 +72,7 @@ parts:
     override-pull: |
         snapcraftctl pull
         cd $SNAPCRAFT_PART_SRC
-        python3 tools/strip_hashes.py letsencrypt-auto-source/pieces/dependency-requirements.txt | grep -v python-augeas > snap-constraints.txt
+        python3 tools/strip_hashes.py letsencrypt-auto-source/pieces/dependency-requirements.txt > snap-constraints.txt
         snapcraftctl set-version `git describe|sed s/^v//`
   wrappers:
     plugin: dump
diff --git a/tools/snap/build_remote.py b/tools/snap/build_remote.py
index 176fff9c8..bd2bbb683 100755
--- a/tools/snap/build_remote.py
+++ b/tools/snap/build_remote.py
@@ -37,7 +37,7 @@ def _build_snap(target, archs, status, lock):
         with tempfile.NamedTemporaryFile() as f:
             subprocess.check_output(
                 ('"{0}" tools/strip_hashes.py letsencrypt-auto-source/pieces/dependency-requirements.txt '
-                 '| grep -v python-augeas > "{1}"').format(sys.executable, f.name),
+                 '> "{1}"').format(sys.executable, f.name),
             shell=True, cwd=CERTBOT_DIR)
             subprocess.check_output(
                 ('"{0}" tools/merge_requirements.py tools/dev_constraints.txt '