Add «main» to Ubuntu backports repos.

diff --git a/manifests/backports.pp b/manifests/backports.pp
index 147801e6e8042541fc804a3a2a92b564ef0ac9f1..aafdf96578dfa35cc599cc0af821fd6ea67d2f30 100644 (file)
--- a/manifests/backports.pp
+++ b/manifests/backports.pp
@@ -33,7 +33,7 @@ class apt::backports(
     release    => "${release_real}-backports",
     repos      => $::lsbdistid ? {
       'debian' => 'main contrib non-free',
     release    => "${release_real}-backports",
     repos      => $::lsbdistid ? {
       'debian' => 'main contrib non-free',

-      'ubuntu' => 'universe multiverse restricted',
+      'ubuntu' => 'main universe multiverse restricted',

     },
     key        => $::lsbdistid ? {
       'debian' => '55BE302B',
     },
     key        => $::lsbdistid ? {
       'debian' => '55BE302B',

diff --git a/spec/classes/backports_spec.rb b/spec/classes/backports_spec.rb
index 17e34a0e01566c4ac3bbdf5c4c05e6defa9b7ad9..27c6708f259407a5b9d2e550c3f0d8eb37395be7 100644 (file)
--- a/spec/classes/backports_spec.rb
+++ b/spec/classes/backports_spec.rb
@@ -13,7 +13,7 @@ describe 'apt::backports', :type => :class do
     it { should contain_apt__source('backports').with({
         'location'   => 'http://old-releases.ubuntu.com/ubuntu',
         'release'    => 'karmic-backports',
     it { should contain_apt__source('backports').with({
         'location'   => 'http://old-releases.ubuntu.com/ubuntu',
         'release'    => 'karmic-backports',

-        'repos'      => 'universe multiverse restricted',
+        'repos'      => 'main universe multiverse restricted',

         'key'        => '437D05B5',
         'key_server' => 'pgp.mit.edu',
         'pin'        => '200',
         'key'        => '437D05B5',
         'key_server' => 'pgp.mit.edu',
         'pin'        => '200',