[debian-edu-commits] debian-edu/ 01/01: Remove unused code to add debian and skolelinux APT source in our apt-setup script.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-install.

commit be4c1a899aa942fdd26686773ce8acc5567132ac
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Oct 7 14:33:17 2014 +0200

    Remove unused code to add debian and skolelinux APT source in our apt-setup script.
---
 apt-setup/generators/70debian-edu-install | 16 ----------------
 debian/changelog                          |  2 ++
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/apt-setup/generators/70debian-edu-install b/apt-setup/generators/70debian-edu-install
index 867aa6f..b501a6d 100644
--- a/apt-setup/generators/70debian-edu-install
+++ b/apt-setup/generators/70debian-edu-install
@@ -95,21 +95,5 @@ if [ "$PROTOCOL" = "http" ] ; then
     fi
 fi
 
-# if a country is selected for mirror, then I guess we can continue
-# without adding an official mirror
-db_get mirror/country || true
-if [ "$RET" != "enter information manually" ] ; then 
-    log "Mirror is country specific, not touching official mirror."
-    disable_exception
-    exit 0
-fi
-
-echo "# you can replace http.debian.net with ftp.no.debian.org or any other" >> $file
-echo "# debian mirror:" >> $file
-echo "deb http://http.debian.net/debian $codename $dists" >> $file
-echo "deb http://ftp.skolelinux.no/skolelinux $educodename local" >> $file
-
-edu-etcvcs commit
-
 disable_exception
 exit 0
diff --git a/debian/changelog b/debian/changelog
index 252504a..b593322 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ debian-edu-install (1.807) UNRELEASED; urgency=low
     http.debian.net as the default mirror.
   * Save a process by using exec in eatmydata dpkg wrapper.
   * Fix typo in log message from apt-setup code.
+  * Remove unused code to add debian and skolelinux APT source in our
+    apt-setup script.
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 07 Oct 2014 09:49:52 +0200
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-install.git