Here is the diff for review by ubuntu-sru: === modified file 'DistUpgrade/DistUpgradeController.py' --- DistUpgrade/DistUpgradeController.py 2008-04-29 08:15:28 +0000 +++ DistUpgrade/DistUpgradeController.py 2008-04-29 13:01:28 +0000 @@ -139,6 +139,12 @@ self.serverMode = False if self.options and self.options.mode == "server": self.serverMode = True + # if we upgrade from a server CD we run in server mode + if cdrompath: + p = os.path.join(cdrompath, ".disk","info") + if (os.path.exists(p) and + open(p).readline().startswith("Ubuntu-Server ")): + self.serverMode = True # the configuration self.config = DistUpgradeConfig(datadir)
=== modified file 'DistUpgrade/cdromupgrade' --- DistUpgrade/cdromupgrade 2008-02-29 22:24:31 +0000 +++ DistUpgrade/cdromupgrade 2008-04-29 13:08:57 +0000 @@ -29,4 +29,4 @@ echo "Could not find the upgrade application in the archive, exiting" exit 1 fi -$TMPDIR/$CODENAME --cdrom "$cddirname" +$TMPDIR/$CODENAME --cdrom "$cddirname" $@ === modified file 'debian/changelog' --- debian/changelog 2008-04-29 10:51:24 +0000 +++ debian/changelog 2008-04-29 13:09:40 +0000 @@ -1,3 +1,14 @@ +update-manager (1:0.87.26) hardy-proposed; urgency=low + + * DistUpgrade/DistUpgradeController.py: + - run in server mode on a server CD (LP: #222895) + * DistUpgrade/cdromupgrade: + - allow passing of arguments (like --mode=server) + to better support server upgrades with the dvd + (LP: #222895) + + -- + update-manager (1:0.87.25) hardy-proposed; urgency=low * DistUpgrade/DistUpgradeApport.py: -- failed to do /cdromupgrade on a 7.10 server. https://bugs.launchpad.net/bugs/222895 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs