From 5e635d54b5b974e99af5c44fcf0e928c53986b1f Mon Sep 17 00:00:00 2001
From: Ben Grande <ben.grande.b@gmail.com>
Date: Fri, 17 Jan 2025 19:34:05 +0100
Subject: [PATCH] doc: remove outdated submodule workaround

---
 salt/qubes-builder/README.md     | 15 ++-------------
 salt/qubes-builder/configure.sls | 13 ++-----------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/salt/qubes-builder/README.md b/salt/qubes-builder/README.md
index 16f360f..27cfdb4 100644
--- a/salt/qubes-builder/README.md
+++ b/salt/qubes-builder/README.md
@@ -32,18 +32,6 @@ Qubes Executor lacking some dependencies on Debian such as
 builder qube was Debian based, the executor qube still needs to be a Fedora
 template.
 
-<!-- TODO: remove after 1 month: 2024-08-4 -->
-If installation fails on non existent qubes-infrastructure-mirrors directory
-during the `qubes-builder.configure` state, please
-[manually pull new commits](#Pulling new commits) and then run the state
-again. This issue will occur to everyone that ran the same state before
-`2024-07-01`, due to [submodule addition](https://github.com/QubesOS/qubes-builderv2/commit/bc6d9a9954d985d2be3ec76ce86d44fea13d345b).
-Qusal maintainer decision is not to handle such issue automatically as it
-can lead to data loss in case user does manual changes, the installation would
-need to `reset` the user changes and to do a clean `pull` that wouldn't fail.
-After you've pulled the commit including the `.gitmodules` once, future
-installations won't have this issue.
-
 *   Top:
 
 ```sh
@@ -93,11 +81,12 @@ unattended build.
 
 The installation will clone the repository but not pull new commits. You will
 need to pull new commits from time to time, their signature will be
-automatically verified before merging them to your git index.
+automatically verified them being merged to your git index.
 
 Pull `qubes-builderv2` commits:
 
 ```sh
+cd ~/src/qubes-builderv2
 git pull
 ```
 
diff --git a/salt/qubes-builder/configure.sls b/salt/qubes-builder/configure.sls
index e9bb3f7..a391e96 100644
--- a/salt/qubes-builder/configure.sls
+++ b/salt/qubes-builder/configure.sls
@@ -66,7 +66,7 @@ include:
     - target: /home/user/src/qubes-builderv2
     - user: user
 
-"{{ slsdotpath }}-git-clone-infrastructure-mirrors":
+"{{ slsdotpath }}-git-submodule-update":
   cmd.run:
     - require:
       - cmd: "{{ slsdotpath }}-import-keys"
@@ -88,7 +88,7 @@ include:
   git.config_set:
     - require:
       - cmd: "{{ slsdotpath }}-import-keys"
-      - cmd: "{{ slsdotpath }}-git-clone-infrastructure-mirrors"
+      - cmd: "{{ slsdotpath }}-git-submodule-update"
     - name: gpg.program
     - value: gpg-qubes-builder
     - repo: /home/user/src/qubes-builderv2/qubesbuilder/plugins/publish/mirrors
@@ -103,13 +103,4 @@ include:
     - cwd: /home/user/src/qubes-builderv2
     - runas: user
 
-"{{ slsdotpath }}-git-verify-HEAD-infrastructure-mirrors":
-  cmd.run:
-    - require:
-      - cmd: "{{ slsdotpath }}-git-clone-infrastructure-mirrors"
-      - cmd: "{{ slsdotpath }}-import-ownertrust"
-    - name: GNUPGHOME="$HOME/.gnupg/qubes-builder" git -c gpg.program=gpg2 verify-commit "HEAD^{commit}"
-    - cwd: /home/user/src/qubes-builderv2/qubesbuilder/plugins/publish/mirrors
-    - runas: user
-
 {% endif -%}