Merge pull request #239 from drkp/master

Fix repo validation regexps for Ubuntu 15.04/15.10 (#238)
voxpupuli · Jan 1, 2017 · 634231f · 634231f
2 parents 6f18cf4 + 1738d15
commit 634231f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -39,10 +39,10 @@
  validate_re($repo_url_suffix, '^0\.1[02]$', $suffix_error_msg)
  }
  elsif $::operatingsystemrelease =~ /^15\.04$/ {
- validate_re($repo_url_suffix, '^(0\.1[02]|[45]\.x)x$', $suffix_error_msg)
+ validate_re($repo_url_suffix, '^(0\.1[02]|[45]\.x)$', $suffix_error_msg)
  }
  elsif $::operatingsystemrelease =~ /^15\.10$/ {
- validate_re($repo_url_suffix, '^(0\.1[02]|[456]\.x)x$', $suffix_error_msg)
+ validate_re($repo_url_suffix, '^(0\.1[02]|[456]\.x)$', $suffix_error_msg)
  }
  elsif $::operatingsystemrelease =~ /^1[246]\.04$/ { #LTS
  validate_re($repo_url_suffix, '^(0\.1[02]|[456]\.x)$', $suffix_error_msg)