Skip to content

Commit 40da893

Browse files
committed
Merge branch 'deb822_source'
Integrate `apt::source_deb822` into the main `apt::source` defined-type.
2 parents 01158f8 + 5542e4c commit 40da893

File tree

4 files changed

+219
-142
lines changed

4 files changed

+219
-142
lines changed

manifests/params.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
'path' => $sources_list_d,
4545
'ext' => '.list',
4646
},
47-
'source' => {
47+
'sources' => {
4848
'path' => $sources_list_d,
4949
'ext' => '.sources',
5050
},

manifests/setting.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
$setting_type = $title_array[0]
3939
$base_name = join(delete_at($title_array, 0), '-')
4040

41-
assert_type(Pattern[/\Aconf\z/, /\Apref\z/, /\Alist\z/, /\Asource\z/], $setting_type) |$a, $b| {
42-
fail("apt::setting resource name/title must start with either 'conf-', 'pref-' or 'list-'")
41+
assert_type(Pattern[/\Aconf\z/, /\Apref\z/, /\Alist\z/, /\Asources\z/], $setting_type) |$a, $b| {
42+
fail("apt::setting resource name/title must start with either 'conf-', 'pref-', 'list-', or 'sources-'")
4343
}
4444

4545
if $priority !~ Integer {
@@ -49,7 +49,7 @@
4949
}
5050
}
5151

52-
if ($setting_type == 'list') or ($setting_type == 'pref') or ($setting_type == 'source') {
52+
if ($setting_type == 'list') or ($setting_type == 'pref') or ($setting_type == 'sources') {
5353
$_priority = ''
5454
} else {
5555
$_priority = $priority

0 commit comments

Comments
 (0)