- $filename_without_slashes = regsubst($name, '/', '-', 'G')
- $filename_without_dots = regsubst($filename_without_slashes, '\.', '_', 'G')
- $filename_without_pluses = regsubst($filename_without_dots, '\+', '_', 'G')
- $filename_without_ppa = regsubst($filename_without_pluses, '^ppa:', '', 'G')
- $sources_list_d_filename = "${filename_without_ppa}-${release}.list"
+ if versioncmp($facts['lsbdistrelease'], '15.10') >= 0 {
+ $distid = downcase($facts['lsbdistid'])
+ $filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2-${release}")
+ } else {
+ $filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-\\2-${release}")
+ }
+
+ $filename_no_slashes = regsubst($filename, '/', '-', 'G')
+ $filename_no_specialchars = regsubst($filename_no_slashes, '[\.\+]', '_', 'G')
+ $sources_list_d_filename = "${filename_no_specialchars}.list"