Merge ~nteodosio/software-properties:ppa-removal into software-properties:ubuntu/master

[Nathan Teodosio]

Fixes failed Deb822 format PPA removal.

 LP:2059796

[Paride Legovini (paride)]

The diff itself LGTM, but I requested more info on the bug itself:

https://bugs.launchpad.net/ubuntu/+source/software-properties/+bug/2059796

[Paride Legovini (paride)]

Thanks for the extra info. This LGTM.

I'll test a package build locally before merging.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 18e3c48..2afafdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+software-properties (0.99.47) noble; urgency=medium
+
+  * Fix failed removal of Deb822 formated source in "Other Software" tab
+    (LP: #2059796).
+
+ -- Nathan Pratta Teodosio <[e-mail]>  Tue, 09 Apr 2024 09:02:50 +0200
+
 software-properties (0.99.46) noble; urgency=medium
 
   * ppa: do not enable deb822 logic when input is sources.list line or URI
diff --git a/softwareproperties/SoftwareProperties.py b/softwareproperties/SoftwareProperties.py
index 636ece5..25f1340 100644
--- a/softwareproperties/SoftwareProperties.py
+++ b/softwareproperties/SoftwareProperties.py
@@ -799,7 +799,10 @@ class SoftwareProperties(object):
     # file are gone and the file is not saved. we work around that
     # here
     if source.file != apt_pkg.config.find_file("Dir::Etc::sourcelist"):
-      self.sourceslist.list.append(SourceEntry("", file=source.file))
+      if source.file.endswith(".sources"):
+        self.sourceslist.list.append(Deb822SourceEntry("", file=source.file))
+      else:
+        self.sourceslist.list.append(SourceEntry("", file=source.file))
     try:
       self.sourceslist.remove(source)
     except ValueError: