From 0704ed7155433750011e128550a8fb55d94121c0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 5 Sep 2006 13:18:47 +0200 Subject: * DistUpgrade/forced_obsoletes.txt: - no longer needed, part of DistUpgrade.cfg now * DistUpgrade/mirrors.txt, DistUpgrade/removal_blacklist.txt: - renamed for consitency * DistUpgrade/DistUpgrade.cfg, DistUpgrade/DistUpgradeCache.py: - added "RemovalBlacklistFile" instead of hardcoding it * DistUpgrade/DistUpgradeConfigParser.py: - added "datadir" to constructor * DistUpgrade/DistUpgradeControler.py: - added datadir * DistUpgrade/DistUpgradeView.py: - added "hideStep()" method - added STEP_PREPARE, STEP_MODIFY_SOURCES, STEP_FETCH_INSTALL, STEP_CLEANUP, STEP_REBOOT * DistUpgrade/DistUpgradeViewGtk.py: - implemendted hideStep() - added datadir arguemnt for constructor * dist-upgrade.py - run it with the "." as arguemnt for the config * UpdateManager/UpdateManager.py: - if it can't be updated, ask about a dist-upgrade instead * update-manager. - added --dist-upgrade * po/*.po - make update-po --- DistUpgrade/DistUpgrade.cfg | 3 +- DistUpgrade/DistUpgradeCache.py | 10 +- DistUpgrade/DistUpgradeConfigParser.py | 7 +- DistUpgrade/DistUpgradeControler.py | 21 ++- DistUpgrade/DistUpgradeView.py | 11 +- DistUpgrade/DistUpgradeViewGtk.py | 18 ++- DistUpgrade/dist-upgrade.py | 2 +- DistUpgrade/forced_obsoletes.txt | 1 - DistUpgrade/mirrors.cfg | 282 +++++++++++++++++++++++++++++++++ DistUpgrade/mirrors.txt | 282 --------------------------------- DistUpgrade/removal_blacklist.cfg | 8 + DistUpgrade/removal_blacklist.txt | 8 - 12 files changed, 341 insertions(+), 312 deletions(-) delete mode 100644 DistUpgrade/forced_obsoletes.txt create mode 100644 DistUpgrade/mirrors.cfg delete mode 100644 DistUpgrade/mirrors.txt create mode 100644 DistUpgrade/removal_blacklist.cfg delete mode 100644 DistUpgrade/removal_blacklist.txt (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgrade.cfg b/DistUpgrade/DistUpgrade.cfg index 02a77564..7a8ebba9 100644 --- a/DistUpgrade/DistUpgrade.cfg +++ b/DistUpgrade/DistUpgrade.cfg @@ -10,6 +10,7 @@ BaseMetaPkgs=ubuntu-minimal PostUpgradePurge=xorg-common, libgl1-mesa Demotions=demoted.cfg RemoveEssentialOk=sysvinit +RemovalBlacklistFile=removal_blacklist.cfg # information about the individual meta-pkgs [ubuntu-desktop] @@ -36,7 +37,7 @@ BackupExt=distUpgrade From=dapper To=edgy ValidOrigin=Ubuntu -ValidMirrors = mirrors.txt +ValidMirrors = mirrors.cfg [Network] MaxRetries=3 \ No newline at end of file diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 1f53b6be..680e7d9e 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -12,20 +12,16 @@ from DistUpgradeView import FuzzyTimeToStr class MyCache(apt.Cache): # init - def __init__(self, progress=None): + def __init__(self, config, progress=None): apt.Cache.__init__(self, progress) self.to_install = [] self.to_remove = [] - self.config = DistUpgradeConfig() + self.config = config self.metapkgs = self.config.getlist("Distro","MetaPkgs") # a list of regexp that are not allowed to be removed - self.removal_blacklist = [] - for line in open("removal_blacklist.txt").readlines(): - line = line.strip() - if not line == "" or line.startswith("#"): - self.removal_blacklist.append(line) + self.removal_blacklist = config.getListFromFile("Distro","RemovalBlacklistFile") # properties @property diff --git a/DistUpgrade/DistUpgradeConfigParser.py b/DistUpgrade/DistUpgradeConfigParser.py index a4c55080..6879dfda 100644 --- a/DistUpgrade/DistUpgradeConfigParser.py +++ b/DistUpgrade/DistUpgradeConfigParser.py @@ -2,9 +2,10 @@ from ConfigParser import ConfigParser, NoOptionError class DistUpgradeConfig(ConfigParser): - def __init__(self): + def __init__(self, datadir): ConfigParser.__init__(self) - self.read(['DistUpgrade.cfg']) + self.datadir=datadir + self.read([datadir+'/DistUpgrade.cfg']) def getlist(self, section, option): try: tmp = self.get(section, option) @@ -17,7 +18,7 @@ class DistUpgradeConfig(ConfigParser): filename = self.get(section, option) except NoOptionError: return [] - items = [x.strip() for x in open(filename)] + items = [x.strip() for x in open(self.datadir+"/"+filename)] return filter(lambda s: not s.startswith("#") and not s == "", items) diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 13050f49..a51fa485 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -86,10 +86,20 @@ class AptCdrom(object): class DistUpgradeControler(object): """ this is the controler that does most of the work """ - def __init__(self, distUpgradeView, cdromPath=None): - gettext.bindtextdomain("update-manager",os.path.join(os.getcwd(),"mo")) + def __init__(self, distUpgradeView, cdromPath=None, datadir=None): + # setup the pathes + localedir = "/usr/share/locale/update-manager/" + if datadir == None: + datadir = os.getcwd() + localedir = os.path.join(datadir,"mo") + gladedir = datadir + self.datadir = datadir + + # init gettext + gettext.bindtextdomain("update-manager",localedir) gettext.textdomain("update-manager") + # setup the view self._view = distUpgradeView self._view.updateStatus(_("Reading cache")) self.cache = None @@ -98,8 +108,8 @@ class DistUpgradeControler(object): self.aptcdrom = AptCdrom(distUpgradeView, cdromPath) self.useNetwork = True - # the configuration - self.config = DistUpgradeConfig() + # the configuration + self.config = DistUpgradeConfig(datadir) self.sources_backup_ext = "."+self.config.get("Files","BackupExt") # some constants here @@ -113,13 +123,14 @@ class DistUpgradeControler(object): # turn on debuging in the cache apt_pkg.Config.Set("Debug::pkgProblemResolver","true") apt_pkg.Config.Set("Debug::pkgDepCache::AutoInstall","true") + # FIXME: make this "append"? fd = os.open("/var/log/dist-upgrade/apt.log", os.O_RDWR|os.O_CREAT|os.O_TRUNC, 0644) os.dup2(fd,1) os.dup2(fd,2) def openCache(self): - self.cache = MyCache(self._view.getOpCacheProgress()) + self.cache = MyCache(self.config, self._view.getOpCacheProgress()) def prepare(self): """ initial cache opening, sanity checking, network checking """ diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py index 27817b13..9fda83d4 100644 --- a/DistUpgrade/DistUpgradeView.py +++ b/DistUpgrade/DistUpgradeView.py @@ -44,7 +44,13 @@ class DumbTerminal(object): def call(self, cmd): " expects a command in the subprocess style (as a list) " subprocess.call(cmd) - + + +(STEP_PREPARE, + STEP_MODIFY_SOURCES, + STEP_FETCH_INSTALL, + STEP_CLEANUP, + STEP_REBOOT) = range(1,6) class DistUpgradeView(object): " abstraction for the upgrade view " @@ -75,6 +81,9 @@ class DistUpgradeView(object): 5. Complete """ pass + def hideStep(self, step): + " hide a certain step from the GUI " + pass def confirmChanges(self, summary, changes, downloadSize, actions=None): """ display the list of changed packages (apt.Package) and return if the user confirms them diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index c58c1fcc..73440f3e 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -303,17 +303,24 @@ class DistUpgradeVteTerminal(object): class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): " gtk frontend of the distUpgrade tool " - def __init__(self): + def __init__(self, datadir=None): + if not datadir: + localedir=os.path.join(os.getcwd(),"mo") + gladedir=os.getcwd() + else: + localedir="/usr/share/locale/update-manager" + gladedir=os.path.join(datadir, "glade") + # FIXME: i18n must be somewhere relative do this dir try: - bindtextdomain("update-manager",os.path.join(os.getcwd(),"mo")) + bindtextdomain("update-manager", localedir) gettext.textdomain("update-manager") except Exception, e: logging.warning("Error setting locales (%s)" % e) icons = gtk.icon_theme_get_default() gtk.window_set_default_icon(icons.load_icon("update-manager", 32, 0)) - SimpleGladeApp.__init__(self, "DistUpgrade.glade", + SimpleGladeApp.__init__(self, gladedir+"/DistUpgrade.glade", None, domain="update-manager") # we dont use this currently #self.window_main.set_keep_above(True) @@ -398,6 +405,11 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): return self._cdromProgress def updateStatus(self, msg): self.label_status.set_text("%s" % msg) + def hideStep(self, step): + image = getattr(self,"image_step%i" % step) + label = getattr(self,"label_step%i" % step) + image.hide() + label.hide() def setStep(self, step): # first update the "last" step as completed size = gtk.ICON_SIZE_MENU diff --git a/DistUpgrade/dist-upgrade.py b/DistUpgrade/dist-upgrade.py index c7a2a7b7..07320fb9 100755 --- a/DistUpgrade/dist-upgrade.py +++ b/DistUpgrade/dist-upgrade.py @@ -21,7 +21,7 @@ if __name__ == "__main__": format='%(asctime)s %(levelname)s %(message)s', filemode='w') - config = DistUpgradeConfig() + config = DistUpgradeConfig(".") requested_view= config.get("View","View") try: view_modul = __import__(requested_view) diff --git a/DistUpgrade/forced_obsoletes.txt b/DistUpgrade/forced_obsoletes.txt deleted file mode 100644 index 1941b867..00000000 --- a/DistUpgrade/forced_obsoletes.txt +++ /dev/null @@ -1 +0,0 @@ -xscreensaver diff --git a/DistUpgrade/mirrors.cfg b/DistUpgrade/mirrors.cfg new file mode 100644 index 00000000..7ab0826c --- /dev/null +++ b/DistUpgrade/mirrors.cfg @@ -0,0 +1,282 @@ +#ubuntu +http://archive.ubuntu.com/ubuntu +http://security.ubuntu.com/ubuntu +ftp://archive.ubuntu.com/ubuntu +ftp://security.ubuntu.com/ubuntu + +##===Australia=== +http://ftp.iinet.net.au/pub/ubuntu/ +http://mirror.optus.net/ubuntu/ +http://mirror.isp.net.au/ftp/pub/ubuntu/ +http://www.planetmirror.com/pub/ubuntu/ +http://ftp.filearena.net/pub/ubuntu/ +http://mirror.pacific.net.au/linux/ubuntu/ +ftp://mirror.isp.net.au/pub/ubuntu/ +ftp://ftp.planetmirror.com/pub/ubuntu/ +ftp://ftp.filearena.net/pub/ubuntu/ +ftp://mirror.internode.on.net/pub/ubuntu/ubuntu(InternodeCustomersonly) +ftp://ftp.iinet.net.au/pub/ubuntu/ +ftp://mirror.pacific.net.au/linux/ubuntu/ +rsync://ftp.iinet.net.au/ubuntu/ +rsync://mirror.isp.net.au/ubuntu +rsync://rsync.filearena.net/ubuntu/ + +##===Austria=== +http://ubuntu.inode.at/ubuntu/ +http://ubuntu.uni-klu.ac.at/ubuntu/ +http://gd.tuwien.ac.at/opsys/linux/ubuntu/archive/ +ftp://ubuntu.inode.at/ubuntu/ +ftp://ftp.uni-klu.ac.at/linux/ubuntu/ +ftp://gd.tuwien.ac.at/opsys/linux/ubuntu/archive/ +rsync://ubuntu.inode.at/ubuntu/ubuntu/ +rsync://gd.tuwien.ac.at/ubuntu/archive/ + +#===Belgium=== +http://ftp.belnet.be/pub/mirror/ubuntu.com/ +http://ftp.belnet.be/packages/ubuntu/ubuntu +http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ +http://mirror.freax.be/ubuntu/archive.ubuntu.com/ +ftp://ftp.belnet.be/pub/mirror/ubuntu.com/ +ftp://ftp.belnet.be/packages/ubuntu/ubuntu +ftp://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ + +#===Brazil=== +http://espelhos.edugraf.ufsc.br/ubuntu/ +http://ubuntu.interlegis.gov.br/archive/ +http://ubuntu.c3sl.ufpr.br/ubuntu/ + +#===Canada=== +ftp://ftp.cs.mun.ca/pub/mirror/ubuntu/ +rsync://rsync.cs.mun.ca/ubuntu/ +http://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/ +ftp://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/ +http://mirror.arcticnetwork.ca/pub/ubuntu/packages/ +ftp://mirror.arcticnetwork.ca/pub/ubuntu/packages/ +rsync://rsync.arcticnetwork.ca/ubuntu-packages + +#===China=== +http://archive.ubuntu.org.cn/ubuntu/ +http://debian.cn99.com/ubuntu/ +http://mirror.lupaworld.com/ubuntu/ + +#===CostaRica=== +http://ftp.ucr.ac.cr/ubuntu/ +ftp://ftp.ucr.ac.cr/pub/ubuntu/ + +#===CzechRepublic=== +http://archive.ubuntu.cz/ubuntu/ +ftp://archive.ubuntu.cz/ubuntu/ +http://ubuntu.supp.name/ubuntu/ + +#===Denmark=== +http://mirrors.dk.telia.net/ubuntu/ +http://mirrors.dotsrc.org/ubuntu/ +http://klid.dk/homeftp/ubuntu/ +ftp://mirrors.dk.telia.net/ubuntu/ +ftp://mirrors.dotsrc.org/ubuntu/ +ftp://klid.dk/ubuntu/ + +#===Estonia=== +http://ftp.estpak.ee/pub/ubuntu/ +ftp://ftp.estpak.ee/pub/ubuntu/ + +#===Finland=== +http://www.nic.funet.fi/pub/mirrors/archive.ubuntu.com/ +ftp://ftp.funet.fi/pub/mirrors/archive.ubuntu.com/ + +#===France=== +http://mir1.ovh.net/ubuntu/ubuntu/ +http://fr.archive.ubuntu.com/ubuntu/ +http://ftp.u-picardie.fr/pub/ubuntu/ubuntu/ +http://ftp.oleane.net/pub/ubuntu/ +ftp://mir1.ovh.net/ubuntu/ubuntu/ +ftp://fr.archive.ubuntu.com/ubuntu/ +ftp://ftp.u-picardie.fr/pub/ubuntu/ubuntu/ +ftp://ftp.proxad.net/mirrors/ftp.ubuntu.com/ubuntu/(slow) +ftp://ftp.oleane.net/pub/ubuntu/ +rsync://mir1.ovh.net/ubuntu/ubuntu/ + +#===Germany=== +http://debian.charite.de/ubuntu/ +http://ftp.inf.tu-dresden.de/os/linux/dists/ubuntu +http://www.artfiles.org/ubuntu.com +http://ftp.rz.tu-bs.de/pub/mirror/ubuntu-packages/ +http://ftp.join.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ +http://www.ftp.uni-erlangen.de/pub/mirrors/ubuntu/ +http://debian.tu-bs.de/ubuntu +ftp://debian.charite.de/ubuntu/ +ftp://ftp.fu-berlin.de/linux/ubuntu/ +ftp://ftp.rz.tu-bs.de/pub/mirror/ubuntu-packages/ +ftp://ftp.join.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ +ftp://ftp.uni-erlangen.de/pub/mirrors/ubuntu/ +ftp://debian.tu-bs.de/ubuntu +rsync://ftp.inf.tu-dresden.de/ubuntu +rsync://ftp.rz.tu-bs.de/pub/mirror/ubuntu-packages/ +rsync://ftp.join.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ +rsync://debian.tu-bs.de/ubuntu + +#===Greece=== +http://ftp.ntua.gr/pub/linux/ubuntu/ +ftp://ftp.ntua.gr/pub/linux/ubuntu/ + +#===Hungary=== +http://ftp.kfki.hu/linux/ubuntu/ +ftp://ftp.kfki.hu/pub/linux/ubuntu/ +ftp://ftp.fsn.hu/pub/linux/distributions/ubuntu/ + +#===Indonesia=== +http://komo.vlsm.org/ubuntu/ +http://kambing.vlsm.org/ubuntu/ +rsync://komo.vlsm.org/ubuntu/ +rsync://kambing.vlsm.org/ubuntu/ + +#===Iceland=== +http://ubuntu.odg.cc/ +http://ubuntu.lhi.is/ + +#===Ireland=== +http://ftp.esat.net/mirrors/archive.ubuntu.com/ +http://ftp.heanet.ie/pub/ubuntu/ +ftp://ftp.esat.net/mirrors/archive.ubuntu.com/ +ftp://ftp.heanet.ie/pub/ubuntu/ +rsync://ftp.esat.net/mirrors/archive.ubuntu.com/ +rsync://ftp.heanet.ie/pub/ubuntu/ + +#===Italy=== +http://ftp.linux.it/ubuntu/ +http://na.mirror.garr.it/mirrors/ubuntu-archive/ +ftp://ftp.linux.it/ubuntu/ +ftp://na.mirror.garr.it/mirrors/ubuntu-archive/ +rsync://na.mirror.garr.it/ubuntu-archive/ + +#===Japan=== +http://ubuntu.mithril-linux.org/archives/ + +#===Korea=== +http://mirror.letsopen.com/os/ubuntu/ +ftp://mirror.letsopen.com/os/ubuntu/ +http://ftp.kaist.ac.kr/pub/ubuntu/ +ftp://ftp.kaist.ac.kr/pub/ubuntu/ +rsync://ftp.kaist.ac.kr/ubuntu/ + +#===Latvia=== +http://ubuntu-arch.linux.edu.lv/ubuntu/ + +#===Lithuania=== +http://ftp.litnet.lt/pub/ubuntu/ +ftp://ftp.litnet.lt/pub/ubuntu/ + +#===Namibia=== +ftp://ftp.polytechnic.edu.na/pub/ubuntulinux/ + +#===Netherlands=== +http://ftp.bit.nl/ubuntu/(Movedtohttp://nl.archive.ubuntu.com/ubuntu/) +http://ubuntu.synssans.nl +ftp://ftp.bit.nl/ubuntu/(Movedtoftp://nl.archive.ubuntu.com/ubuntu/) +rsync://ftp.bit.nl/ubuntu/(Movedtorsync://nl.archive.ubuntu.com/ubuntu/) + +#===NewZealand=== +ftp://ftp.citylink.co.nz/ubuntu/(maynotbeaccessibleoutsideof.nz) + +#===Nicaragua=== +http://www.computacion.uni.edu.ni/iso/ubuntu/ + +#===Norway=== +http://mirror.trivini.no/ubuntu(Movedtohttp://no.archive.ubuntu.com/ubuntu/) +ftp://mirror.trivini.no/ubuntu(Movedtoftp://no.archive.ubuntu.com/ubuntu/) +ftp://ftp.uninett.no/linux/ubuntu +rsync://ftp.uninett.no/ubuntu + +#===Poland=== +http://ubuntulinux.mainseek.com/ubuntu/ +http://ubuntu.task.gda.pl/ubuntu/ +ftp://ubuntu.task.gda.pl/ubuntu/ +rsync://ubuntu.task.gda.pl/ubuntu/ + +#===Portugal=== +ftp://ftp.rnl.ist.utl.pt/ubuntu/ +http://darkstar.ist.utl.pt/ubuntu/archive/ +http://ubuntu.dcc.fc.up.pt/ + +#===Romania=== +http://ftp.iasi.roedu.net/mirrors/ubuntulinux.org/ubuntu/(fullmirror) +ftp://ftp.iasi.roedu.net/mirrors/ubuntulinux.org/ubuntu/(fullmirror) +rsync://ftp.iasi.roedu.net/ubuntu/(fullmirror) +http://ftp.lug.ro/ubuntu/(i386andamd64) +ftp://ftp.lug.ro/ubuntu/(i386andamd64) + +#===Russia=== +http://debian.nsu.ru/ubuntu/(i386andamd64) +ftp://debian.nsu.ru/ubuntu/(i386andamd64) + +#===SouthAfrica=== +ftp://ftp.is.co.za/ubuntu +ftp://ftp.leg.uct.ac.za/pub/linux/ubuntu +ftp://ftp.sun.ac.za/ftp/ubuntu/ + +#===Spain=== +ftp://ftp.um.es/mirror/ubuntu/ +ftp://ftp.ubuntu-es.org/ubuntu/ + +#===Sweden=== +http://ftp.acc.umu.se/mirror/ubuntu/ +ftp://ftp.se.linux.org/pub/Linux/distributions/ubuntu/ + +#===Switzerland=== +http://mirror.switch.ch/ftp/mirror/ubuntu/ +ftp://mirror.switch.ch/mirror/ubuntu/ + +#===Taiwan=== +http://apt.ubuntu.org.tw/ubuntu/ +ftp://apt.ubuntu.org.tw/ubuntu/ +http://apt.nc.hcc.edu.tw/pub/ubuntu/ +http://ubuntu.csie.ntu.edu.tw/ubuntu/ +ftp://apt.nc.hcc.edu.tw/pub/ubuntu/ +ftp://os.nchc.org.tw/ubuntu/ +ftp://ftp.ee.ncku.edu.tw/pub/ubuntu/ +rsync://ftp.ee.ncku.edu.tw/ubuntu/ +http://ftp.cse.yzu.edu.tw/ftp/Linux/Ubuntu/ubuntu/ +ftp://ftp.cse.yzu.edu.tw/Linux/Ubuntu/ubuntu/ + +#===Turkey=== +http://godel.cs.bilgi.edu.tr/mirror/ubuntu/(i386) +ftp://godel.cs.bilgi.edu.tr/ubuntu/(i386) + +#===UnitedKingdom=== +http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/ +ftp://ftp.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/ +http://www.mirror.ac.uk/mirror/archive.ubuntu.com/ubuntu/ +ftp://ftp.mirror.ac.uk/mirror/archive.ubuntu.com/ubuntu/ +rsync://rsync.mirrorservice.org/archive.ubuntu.com/ubuntu/ +http://ubuntu.blueyonder.co.uk/archive/ +ftp://ftp.blueyonder.co.uk/sites/ubuntu/archive/ + +#===UnitedStates=== +http://mirror.cs.umn.edu/ubuntu/ +http://lug.mtu.edu/ubuntu/ +http://mirror.clarkson.edu/pub/distributions/ubuntu/ +http://ubuntu.mirrors.tds.net/ubuntu/ +http://www.opensourcemirrors.org/ubuntu/ +http://ftp.ale.org/pub/mirrors/ubuntu/ +http://ubuntu.secs.oakland.edu/ +http://mirror.mcs.anl.gov/pub/ubuntu/ +http://mirrors.cat.pdx.edu/ubuntu/ +http://ubuntu.cs.utah.edu/ubuntu/ +http://ftp.ussg.iu.edu/linux/ubuntu/ +http://mirrors.xmission.com/ubuntu/ +http://ftp.osuosl.org/pub/ubuntu/ +http://mirrors.cs.wmich.edu/ubuntu/ +ftp://ftp.osuosl.org/pub/ubuntu/ +ftp://mirrors.xmission.com/ubuntu/ +ftp://ftp.ussg.iu.edu/linux/ubuntu/ +ftp://mirror.clarkson.edu/pub/distributions/ubuntu/ +ftp://ubuntu.mirrors.tds.net/ubuntu/ +ftp://mirror.mcs.anl.gov/pub/ubuntu/ +ftp://mirrors.cat.pdx.edu/ubuntu/ +ftp://ubuntu.cs.utah.edu/pub/ubuntu/ubuntu/ +rsync://ubuntu.cs.utah.edu/ubuntu/ +rsync://mirrors.cat.pdx.edu/ubuntu/ +rsync://mirror.mcs.anl.gov/ubuntu/ +rsync://ubuntu.mirrors.tds.net/ubuntu/ +rsync://mirror.cs.umn.edu/ubuntu/ + diff --git a/DistUpgrade/mirrors.txt b/DistUpgrade/mirrors.txt deleted file mode 100644 index 7ab0826c..00000000 --- a/DistUpgrade/mirrors.txt +++ /dev/null @@ -1,282 +0,0 @@ -#ubuntu -http://archive.ubuntu.com/ubuntu -http://security.ubuntu.com/ubuntu -ftp://archive.ubuntu.com/ubuntu -ftp://security.ubuntu.com/ubuntu - -##===Australia=== -http://ftp.iinet.net.au/pub/ubuntu/ -http://mirror.optus.net/ubuntu/ -http://mirror.isp.net.au/ftp/pub/ubuntu/ -http://www.planetmirror.com/pub/ubuntu/ -http://ftp.filearena.net/pub/ubuntu/ -http://mirror.pacific.net.au/linux/ubuntu/ -ftp://mirror.isp.net.au/pub/ubuntu/ -ftp://ftp.planetmirror.com/pub/ubuntu/ -ftp://ftp.filearena.net/pub/ubuntu/ -ftp://mirror.internode.on.net/pub/ubuntu/ubuntu(InternodeCustomersonly) -ftp://ftp.iinet.net.au/pub/ubuntu/ -ftp://mirror.pacific.net.au/linux/ubuntu/ -rsync://ftp.iinet.net.au/ubuntu/ -rsync://mirror.isp.net.au/ubuntu -rsync://rsync.filearena.net/ubuntu/ - -##===Austria=== -http://ubuntu.inode.at/ubuntu/ -http://ubuntu.uni-klu.ac.at/ubuntu/ -http://gd.tuwien.ac.at/opsys/linux/ubuntu/archive/ -ftp://ubuntu.inode.at/ubuntu/ -ftp://ftp.uni-klu.ac.at/linux/ubuntu/ -ftp://gd.tuwien.ac.at/opsys/linux/ubuntu/archive/ -rsync://ubuntu.inode.at/ubuntu/ubuntu/ -rsync://gd.tuwien.ac.at/ubuntu/archive/ - -#===Belgium=== -http://ftp.belnet.be/pub/mirror/ubuntu.com/ -http://ftp.belnet.be/packages/ubuntu/ubuntu -http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ -http://mirror.freax.be/ubuntu/archive.ubuntu.com/ -ftp://ftp.belnet.be/pub/mirror/ubuntu.com/ -ftp://ftp.belnet.be/packages/ubuntu/ubuntu -ftp://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ - -#===Brazil=== -http://espelhos.edugraf.ufsc.br/ubuntu/ -http://ubuntu.interlegis.gov.br/archive/ -http://ubuntu.c3sl.ufpr.br/ubuntu/ - -#===Canada=== -ftp://ftp.cs.mun.ca/pub/mirror/ubuntu/ -rsync://rsync.cs.mun.ca/ubuntu/ -http://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/ -ftp://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/ -http://mirror.arcticnetwork.ca/pub/ubuntu/packages/ -ftp://mirror.arcticnetwork.ca/pub/ubuntu/packages/ -rsync://rsync.arcticnetwork.ca/ubuntu-packages - -#===China=== -http://archive.ubuntu.org.cn/ubuntu/ -http://debian.cn99.com/ubuntu/ -http://mirror.lupaworld.com/ubuntu/ - -#===CostaRica=== -http://ftp.ucr.ac.cr/ubuntu/ -ftp://ftp.ucr.ac.cr/pub/ubuntu/ - -#===CzechRepublic=== -http://archive.ubuntu.cz/ubuntu/ -ftp://archive.ubuntu.cz/ubuntu/ -http://ubuntu.supp.name/ubuntu/ - -#===Denmark=== -http://mirrors.dk.telia.net/ubuntu/ -http://mirrors.dotsrc.org/ubuntu/ -http://klid.dk/homeftp/ubuntu/ -ftp://mirrors.dk.telia.net/ubuntu/ -ftp://mirrors.dotsrc.org/ubuntu/ -ftp://klid.dk/ubuntu/ - -#===Estonia=== -http://ftp.estpak.ee/pub/ubuntu/ -ftp://ftp.estpak.ee/pub/ubuntu/ - -#===Finland=== -http://www.nic.funet.fi/pub/mirrors/archive.ubuntu.com/ -ftp://ftp.funet.fi/pub/mirrors/archive.ubuntu.com/ - -#===France=== -http://mir1.ovh.net/ubuntu/ubuntu/ -http://fr.archive.ubuntu.com/ubuntu/ -http://ftp.u-picardie.fr/pub/ubuntu/ubuntu/ -http://ftp.oleane.net/pub/ubuntu/ -ftp://mir1.ovh.net/ubuntu/ubuntu/ -ftp://fr.archive.ubuntu.com/ubuntu/ -ftp://ftp.u-picardie.fr/pub/ubuntu/ubuntu/ -ftp://ftp.proxad.net/mirrors/ftp.ubuntu.com/ubuntu/(slow) -ftp://ftp.oleane.net/pub/ubuntu/ -rsync://mir1.ovh.net/ubuntu/ubuntu/ - -#===Germany=== -http://debian.charite.de/ubuntu/ -http://ftp.inf.tu-dresden.de/os/linux/dists/ubuntu -http://www.artfiles.org/ubuntu.com -http://ftp.rz.tu-bs.de/pub/mirror/ubuntu-packages/ -http://ftp.join.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ -http://www.ftp.uni-erlangen.de/pub/mirrors/ubuntu/ -http://debian.tu-bs.de/ubuntu -ftp://debian.charite.de/ubuntu/ -ftp://ftp.fu-berlin.de/linux/ubuntu/ -ftp://ftp.rz.tu-bs.de/pub/mirror/ubuntu-packages/ -ftp://ftp.join.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ -ftp://ftp.uni-erlangen.de/pub/mirrors/ubuntu/ -ftp://debian.tu-bs.de/ubuntu -rsync://ftp.inf.tu-dresden.de/ubuntu -rsync://ftp.rz.tu-bs.de/pub/mirror/ubuntu-packages/ -rsync://ftp.join.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ -rsync://debian.tu-bs.de/ubuntu - -#===Greece=== -http://ftp.ntua.gr/pub/linux/ubuntu/ -ftp://ftp.ntua.gr/pub/linux/ubuntu/ - -#===Hungary=== -http://ftp.kfki.hu/linux/ubuntu/ -ftp://ftp.kfki.hu/pub/linux/ubuntu/ -ftp://ftp.fsn.hu/pub/linux/distributions/ubuntu/ - -#===Indonesia=== -http://komo.vlsm.org/ubuntu/ -http://kambing.vlsm.org/ubuntu/ -rsync://komo.vlsm.org/ubuntu/ -rsync://kambing.vlsm.org/ubuntu/ - -#===Iceland=== -http://ubuntu.odg.cc/ -http://ubuntu.lhi.is/ - -#===Ireland=== -http://ftp.esat.net/mirrors/archive.ubuntu.com/ -http://ftp.heanet.ie/pub/ubuntu/ -ftp://ftp.esat.net/mirrors/archive.ubuntu.com/ -ftp://ftp.heanet.ie/pub/ubuntu/ -rsync://ftp.esat.net/mirrors/archive.ubuntu.com/ -rsync://ftp.heanet.ie/pub/ubuntu/ - -#===Italy=== -http://ftp.linux.it/ubuntu/ -http://na.mirror.garr.it/mirrors/ubuntu-archive/ -ftp://ftp.linux.it/ubuntu/ -ftp://na.mirror.garr.it/mirrors/ubuntu-archive/ -rsync://na.mirror.garr.it/ubuntu-archive/ - -#===Japan=== -http://ubuntu.mithril-linux.org/archives/ - -#===Korea=== -http://mirror.letsopen.com/os/ubuntu/ -ftp://mirror.letsopen.com/os/ubuntu/ -http://ftp.kaist.ac.kr/pub/ubuntu/ -ftp://ftp.kaist.ac.kr/pub/ubuntu/ -rsync://ftp.kaist.ac.kr/ubuntu/ - -#===Latvia=== -http://ubuntu-arch.linux.edu.lv/ubuntu/ - -#===Lithuania=== -http://ftp.litnet.lt/pub/ubuntu/ -ftp://ftp.litnet.lt/pub/ubuntu/ - -#===Namibia=== -ftp://ftp.polytechnic.edu.na/pub/ubuntulinux/ - -#===Netherlands=== -http://ftp.bit.nl/ubuntu/(Movedtohttp://nl.archive.ubuntu.com/ubuntu/) -http://ubuntu.synssans.nl -ftp://ftp.bit.nl/ubuntu/(Movedtoftp://nl.archive.ubuntu.com/ubuntu/) -rsync://ftp.bit.nl/ubuntu/(Movedtorsync://nl.archive.ubuntu.com/ubuntu/) - -#===NewZealand=== -ftp://ftp.citylink.co.nz/ubuntu/(maynotbeaccessibleoutsideof.nz) - -#===Nicaragua=== -http://www.computacion.uni.edu.ni/iso/ubuntu/ - -#===Norway=== -http://mirror.trivini.no/ubuntu(Movedtohttp://no.archive.ubuntu.com/ubuntu/) -ftp://mirror.trivini.no/ubuntu(Movedtoftp://no.archive.ubuntu.com/ubuntu/) -ftp://ftp.uninett.no/linux/ubuntu -rsync://ftp.uninett.no/ubuntu - -#===Poland=== -http://ubuntulinux.mainseek.com/ubuntu/ -http://ubuntu.task.gda.pl/ubuntu/ -ftp://ubuntu.task.gda.pl/ubuntu/ -rsync://ubuntu.task.gda.pl/ubuntu/ - -#===Portugal=== -ftp://ftp.rnl.ist.utl.pt/ubuntu/ -http://darkstar.ist.utl.pt/ubuntu/archive/ -http://ubuntu.dcc.fc.up.pt/ - -#===Romania=== -http://ftp.iasi.roedu.net/mirrors/ubuntulinux.org/ubuntu/(fullmirror) -ftp://ftp.iasi.roedu.net/mirrors/ubuntulinux.org/ubuntu/(fullmirror) -rsync://ftp.iasi.roedu.net/ubuntu/(fullmirror) -http://ftp.lug.ro/ubuntu/(i386andamd64) -ftp://ftp.lug.ro/ubuntu/(i386andamd64) - -#===Russia=== -http://debian.nsu.ru/ubuntu/(i386andamd64) -ftp://debian.nsu.ru/ubuntu/(i386andamd64) - -#===SouthAfrica=== -ftp://ftp.is.co.za/ubuntu -ftp://ftp.leg.uct.ac.za/pub/linux/ubuntu -ftp://ftp.sun.ac.za/ftp/ubuntu/ - -#===Spain=== -ftp://ftp.um.es/mirror/ubuntu/ -ftp://ftp.ubuntu-es.org/ubuntu/ - -#===Sweden=== -http://ftp.acc.umu.se/mirror/ubuntu/ -ftp://ftp.se.linux.org/pub/Linux/distributions/ubuntu/ - -#===Switzerland=== -http://mirror.switch.ch/ftp/mirror/ubuntu/ -ftp://mirror.switch.ch/mirror/ubuntu/ - -#===Taiwan=== -http://apt.ubuntu.org.tw/ubuntu/ -ftp://apt.ubuntu.org.tw/ubuntu/ -http://apt.nc.hcc.edu.tw/pub/ubuntu/ -http://ubuntu.csie.ntu.edu.tw/ubuntu/ -ftp://apt.nc.hcc.edu.tw/pub/ubuntu/ -ftp://os.nchc.org.tw/ubuntu/ -ftp://ftp.ee.ncku.edu.tw/pub/ubuntu/ -rsync://ftp.ee.ncku.edu.tw/ubuntu/ -http://ftp.cse.yzu.edu.tw/ftp/Linux/Ubuntu/ubuntu/ -ftp://ftp.cse.yzu.edu.tw/Linux/Ubuntu/ubuntu/ - -#===Turkey=== -http://godel.cs.bilgi.edu.tr/mirror/ubuntu/(i386) -ftp://godel.cs.bilgi.edu.tr/ubuntu/(i386) - -#===UnitedKingdom=== -http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/ -ftp://ftp.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/ -http://www.mirror.ac.uk/mirror/archive.ubuntu.com/ubuntu/ -ftp://ftp.mirror.ac.uk/mirror/archive.ubuntu.com/ubuntu/ -rsync://rsync.mirrorservice.org/archive.ubuntu.com/ubuntu/ -http://ubuntu.blueyonder.co.uk/archive/ -ftp://ftp.blueyonder.co.uk/sites/ubuntu/archive/ - -#===UnitedStates=== -http://mirror.cs.umn.edu/ubuntu/ -http://lug.mtu.edu/ubuntu/ -http://mirror.clarkson.edu/pub/distributions/ubuntu/ -http://ubuntu.mirrors.tds.net/ubuntu/ -http://www.opensourcemirrors.org/ubuntu/ -http://ftp.ale.org/pub/mirrors/ubuntu/ -http://ubuntu.secs.oakland.edu/ -http://mirror.mcs.anl.gov/pub/ubuntu/ -http://mirrors.cat.pdx.edu/ubuntu/ -http://ubuntu.cs.utah.edu/ubuntu/ -http://ftp.ussg.iu.edu/linux/ubuntu/ -http://mirrors.xmission.com/ubuntu/ -http://ftp.osuosl.org/pub/ubuntu/ -http://mirrors.cs.wmich.edu/ubuntu/ -ftp://ftp.osuosl.org/pub/ubuntu/ -ftp://mirrors.xmission.com/ubuntu/ -ftp://ftp.ussg.iu.edu/linux/ubuntu/ -ftp://mirror.clarkson.edu/pub/distributions/ubuntu/ -ftp://ubuntu.mirrors.tds.net/ubuntu/ -ftp://mirror.mcs.anl.gov/pub/ubuntu/ -ftp://mirrors.cat.pdx.edu/ubuntu/ -ftp://ubuntu.cs.utah.edu/pub/ubuntu/ubuntu/ -rsync://ubuntu.cs.utah.edu/ubuntu/ -rsync://mirrors.cat.pdx.edu/ubuntu/ -rsync://mirror.mcs.anl.gov/ubuntu/ -rsync://ubuntu.mirrors.tds.net/ubuntu/ -rsync://mirror.cs.umn.edu/ubuntu/ - diff --git a/DistUpgrade/removal_blacklist.cfg b/DistUpgrade/removal_blacklist.cfg new file mode 100644 index 00000000..773395be --- /dev/null +++ b/DistUpgrade/removal_blacklist.cfg @@ -0,0 +1,8 @@ +# blacklist of packages that should never be removed +ubuntu-base +ubuntu-desktop +kubuntu-destkop +edubuntu-desktop +linux-image-.* +linux-restricted-.* +nvidia-glx.* diff --git a/DistUpgrade/removal_blacklist.txt b/DistUpgrade/removal_blacklist.txt deleted file mode 100644 index 773395be..00000000 --- a/DistUpgrade/removal_blacklist.txt +++ /dev/null @@ -1,8 +0,0 @@ -# blacklist of packages that should never be removed -ubuntu-base -ubuntu-desktop -kubuntu-destkop -edubuntu-desktop -linux-image-.* -linux-restricted-.* -nvidia-glx.* -- cgit v1.2.3