summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2014-03-21 12:04:25 -0400
committerMicah Anderson <micah@riseup.net>2014-03-21 12:04:25 -0400
commit51b69c26619e0bde9a0a67dba7fdae2ca2526363 (patch)
tree83304a7df42b024889042ad5a2297cfc2b226bc8 /templates
parent082a2f77687b5c9dad63f5b30c672cc495506cd9 (diff)
parent128410f64363f717fc0d5a13faf769843a0b733c (diff)
Merge branch 'master' of buse.riseup.net:shared-apt
Diffstat (limited to 'templates')
-rw-r--r--templates/Debian/sources.list.erb14
1 files changed, 0 insertions, 14 deletions
diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb
index 49cf38c..65b5945 100644
--- a/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@ -34,19 +34,12 @@ deb-src <%= backports_url %> <%= codename %>-backports <%= lrepos %>
<% if (release == "testing" || release == "unstable" || release == "experimental") -%>
# There is no volatile archive for <%= release %>
<% else -%>
-<% if (codename == "lenny" || codename == "etch") -%>
-deb <%= volatile_url=scope.lookupvar('apt::volatile_url') %> <%= codename %>/volatile <%= lrepos %>
-<% if include_src -%>
-deb-src <%= volatile_url %> <%= codename %>/volatile <%= lrepos %>
-<% end -%>
-<% else -%>
deb <%= debian_url %> <%= codename %>-updates <%= lrepos %>
<% if include_src -%>
deb-src <%= debian_url %> <%= codename %>-updates <%= lrepos %>
<% end -%>
<% end -%>
<% end -%>
-<% end -%>
<% if next_release=scope.lookupvar('apt::use_next_release') -%>
### Debian next: <%= next_release=scope.lookupvar('apt::next_release') ; next_codename=scope.lookupvar('apt::next_codename') %>
@@ -72,12 +65,6 @@ deb-src <%= security_url %> <%= next_codename %>/updates <%= lrepos %>
<% if (next_release == "testing" || next_release == "unstable" || next_release == "experimental") -%>
# There is no volatile archive for <%= next_release %>
<% else -%>
-<% if (next_codename == "lenny" || next_codename == "etch") -%>
-deb <%= volatile_url %> <%= next_codename %>/volatile <%= lrepos %>
-<% if include_src then -%>
-deb-src <%= volatile_url %> <%= next_codename %>/volatile <%= lrepos %>
-<% end -%>
-<% else -%>
deb <%= debian_url %> <%= next_codename %>-updates <%= lrepos %>
<% if include_src then -%>
deb-src <%= debian_url %> <%= next_codename %>-updates <%= lrepos %>
@@ -85,4 +72,3 @@ deb-src <%= debian_url %> <%= next_codename %>-updates <%= lrepos %>
<% end -%>
<% end -%>
<% end -%>
-<% end -%>