21 lines
1.1 KiB
Diff
21 lines
1.1 KiB
Diff
diff -Nru software-properties-0.99.22.4+11.0trisquel9/softwareproperties/ppa.py software-properties-0.99.22.4+11.0trisquel9_fix/softwareproperties/ppa.py
|
|
--- software-properties-0.99.22.4+11.0trisquel9/softwareproperties/ppa.py 2023-01-21 14:29:00.314035991 -0600
|
|
+++ software-properties-0.99.22.4+11.0trisquel9_fix/softwareproperties/ppa.py 2023-01-21 14:31:47.658510565 -0600
|
|
@@ -32,6 +32,8 @@
|
|
|
|
from urllib.parse import urlparse
|
|
|
|
+from softwareproperties.trisquel_info import trisquel_upstream_rel
|
|
+
|
|
|
|
PPA_URI_FORMAT = 'https://ppa.launchpadcontent.net/{team}/{ppa}/ubuntu/'
|
|
PRIVATE_PPA_URI_FORMAT = 'https://private-ppa.launchpadcontent.net/{team}/{ppa}/ubuntu/'
|
|
@@ -85,7 +87,7 @@
|
|
|
|
uri_format = PRIVATE_PPA_URI_FORMAT if self.lpppa.private else PPA_URI_FORMAT
|
|
uri = uri_format.format(team=self.teamname, ppa=self.ppaname)
|
|
- line = ('%s %s %s %s' % (self.binary_type, uri, self.dist, ' '.join(comps)))
|
|
+ line = ('%s %s %s %s' % (self.binary_type, uri, trisquel_upstream_rel, ' '.join(comps)))
|
|
self._set_source_entry(line)
|
|
|
|
@property
|