From 258a9240e9fdddd368bbf7d4f780c8a8964cd0d9 Mon Sep 17 00:00:00 2001
From: Shane Mc Cormack <shanemcc@gmail.com>
Date: Mon, 11 Nov 2024 02:54:20 +0000
Subject: [PATCH] Fix for externally-managed python on later ubuntu/debian
 installs.

This is a re-work of #58

Fix #66
Fix #67
Fix #57
---
 tasks/debian12.yml | 13 -------------
 tasks/main.yml     | 11 +++++------
 2 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 tasks/debian12.yml

diff --git a/tasks/debian12.yml b/tasks/debian12.yml
deleted file mode 100644
index 1a2cd90..0000000
--- a/tasks/debian12.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-# Remove EXTERNALLY-MANAGED file if we're on Debian12
-# Related issue: https://github.com/geerlingguy/ansible-role-pip/issues/57
-- name: Get python3 version installed
-  ansible.builtin.command: python3 --version
-  register: py3ver
-  changed_when: false
-
-- name: Remove EXTERNALLY-MANAGED
-  ansible.builtin.file:
-    path: /usr/lib/python3.11/EXTERNALLY-MANAGED
-    state: absent
-  when: py3ver is defined and py3ver.stdout.find("3.11") != -1
diff --git a/tasks/main.yml b/tasks/main.yml
index 816bd6e..cdb8720 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,15 +1,14 @@
 ---
-- name: Remove externally managed from Debian 12
-  ansible.builtin.import_tasks: debian12.yml
-  when:
-    - ansible_distribution == "Debian"
-    - ansible_distribution_major_version|int >= 12
-
 - name: Ensure Pip is installed.
   package:
     name: "{{ pip_package }}"
     state: present
 
+- name: Remove EXTERNALLY-MANAGED
+  ansible.builtin.file:
+    path: /usr/lib/python3.{{ ansible_python.version.minor }}/EXTERNALLY-MANAGED
+    state: absent
+
 - name: Ensure pip_install_packages are installed.
   pip:
     name: "{{ item.name | default(item) }}"