From 9532aeb2dbdf40576b352b78d1907af82cd589c1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 20 Apr 2006 18:07:50 +0200 Subject: * unfinalize the changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2484a06d..3270993c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,7 @@ update-manager (0.42.2ubuntu13) dapper; urgency=low * setup.py: install the icons into the hicolor icon schema (thanks to Sebastian Heinlein) - -- Michael Vogt Wed, 19 Apr 2006 14:44:14 +0200 + -- update-manager (0.42.2ubuntu12) dapper; urgency=low -- cgit v1.2.3 From 6e64cd518909238ee6bb9c992c6dfd8e173fec47 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Apr 2006 19:10:07 +0200 Subject: * DistUpgrade/DistUpgradeViewGtk.py: - make sure dpkg --configure -a is run when something goes wrong --- DistUpgrade/Changelog | 3 +++ DistUpgrade/DistUpgradeControler.py | 4 ++-- DistUpgrade/DistUpgradeViewGtk.py | 14 ++++++++++++-- debian/rules | 2 +- 4 files changed, 18 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index df5bb506..d7885de9 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,3 +1,6 @@ +2006-04-25: + - make sure that DistUpgradeView.getTerminal().call() actually + waits until the command has finished (dpkg --configure -a) 2006-04-18: - add logging to the sources.list modification code - general logging improvements (thanks to Xavier Poinsard) \ No newline at end of file diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 9a03f288..ced5d968 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -223,12 +223,12 @@ class DistUpgradeControler(object): res = self.cache.commit(fprogress,iprogress) except SystemError, e: # installing the packages failed, can't be retried + self._view.getTerminal().call(["dpkg","--configure","-a"]) self._view.error(_("Could not install the upgrades"), _("The upgrade aborts now. Your system " "can be in an unusable state. A recovery " - "is now run (dpkg --configure -a)."), + "was run (dpkg --configure -a)."), "%s" % e) - self._view.getTerminal().call(["dpkg","--configure","-a"]) return False except IOError, e: # fetch failed, will be retried diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 3236ba14..bf1fcbe8 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -253,9 +253,19 @@ class DistUpgradeVteTerminal(object): self.term = term self.parent = parent def call(self, cmd): + def wait_for_child(widget): + #print "wait for child finished" + self.finished=True self.term.show() + self.term.connect("child-exited", wait_for_child) self.parent.expander_terminal.set_expanded(True) self.term.fork_command(command=cmd[0],argv=cmd) + self.finished = False + while not self.finished: + while gtk.events_pending(): + gtk.main_iteration() + time.sleep(0.1) + del self.finished class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): " gtk frontend of the distUpgrade tool " @@ -497,10 +507,10 @@ if __name__ == "__main__": cache[pkg].markInstall() cache.commit(fp,ip) - sys.exit(0) + #sys.exit(0) ip.conffile("TODO","TODO~") view.getTerminal().call(["dpkg","--configure","-a"]) - view.getTerminal().call(["ls"]) + view.getTerminal().call(["ls","-R","/usr"]) view.error("short","long", "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" diff --git a/debian/rules b/debian/rules index 44224c6f..3b3da7d1 100755 --- a/debian/rules +++ b/debian/rules @@ -96,7 +96,7 @@ binary-arch: build install arch-build: rm -rf debian/arch-build mkdir -p debian/arch-build/$(PKG)-$(DEBVER) - tar -c --exclude=arch-build -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(DEBVER);tar xf -) + tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(DEBVER);tar xf -) (cd debian/arch-build/$(PKG)-$(DEBVER) && $(DEB_BUILD_PROG)) binary: binary-indep binary-arch -- cgit v1.2.3 From dc3dc10c9a2835ffef5708db35dd70344860adab Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 28 Apr 2006 23:04:46 +0200 Subject: * changelog finalized --- debian/changelog | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3270993c..848d5c6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +update-manager (0.42.2ubuntu14) dapper; urgency=low + + * wording/glade file fixes (thanks to Sebastian Heinlein) + * many updates to the dist-upgrader code + + -- Michael Vogt Fri, 28 Apr 2006 23:04:08 +0200 + update-manager (0.42.2ubuntu13) dapper; urgency=low * po/POTFILES.in: add missing desktop file (ubuntu: #39410) @@ -9,7 +16,7 @@ update-manager (0.42.2ubuntu13) dapper; urgency=low * setup.py: install the icons into the hicolor icon schema (thanks to Sebastian Heinlein) - -- + -- Michael Vogt Thu, 20 Apr 2006 18:23:54 +0200 update-manager (0.42.2ubuntu12) dapper; urgency=low -- cgit v1.2.3