From owner-p4-projects@FreeBSD.ORG  Sun Aug 12 11:47:27 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 07D8D16A41A; Sun, 12 Aug 2007 11:47:27 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ABAF616A41B
	for <perforce@freebsd.org>; Sun, 12 Aug 2007 11:47:26 +0000 (UTC)
	(envelope-from andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F31613C4A6
	for <perforce@freebsd.org>; Sun, 12 Aug 2007 11:47:26 +0000 (UTC)
	(envelope-from andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7CBlQ0U054040
	for <perforce@freebsd.org>; Sun, 12 Aug 2007 11:47:26 GMT
	(envelope-from andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7CBlQv8054037
	for perforce@freebsd.org; Sun, 12 Aug 2007 11:47:26 GMT
	(envelope-from andrew@freebsd.org)
Date: Sun, 12 Aug 2007 11:47:26 GMT
Message-Id: <200708121147.l7CBlQv8054037@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andrew@freebsd.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 125080 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Aug 2007 11:47:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=125080

Change 125080 by andrew@andrew_hermies on 2007/08/12 11:47:17

	Empty the update list when changing what item is selected on the computer tree
	When no updates are avaliable on the back end don't raise an exception
	When asking to remove updates get the directory correctly and call removeUpdates rather than installUpdates

Affected files ...

.. //depot/projects/soc2007/andrew-update/frontend/facund/controller.py#6 edit
.. //depot/projects/soc2007/andrew-update/frontend/facund/gui/main_window.py#10 edit

Differences ...

==== //depot/projects/soc2007/andrew-update/frontend/facund/controller.py#6 (text+ko) ====

@@ -40,6 +40,7 @@
 
 	def onComputerTreeSelect(self, position):
 		self.__currentDirectory = None
+		self.__updateModel.empty()
 
 		computer = self.__computersModel.getComputer(position[0])
 		self.__view.setConnected(computer.getConnectionStatus())
@@ -60,12 +61,15 @@
 		command = dir.getCommands()[position[2]]
 		response = dir.runCommand(position[2])
 		data = response.getData()
+		if data is None:
+			# We can't to an install or remove when we have nothing
+			self.__view.setInstallable(False, False)
+			return
 		item = data.getData()[0]
 		# Each item will be a pair of <dir, update list>
 		pair = item.getData()
 		theDir = pair[0].getData()
 
-		self.__updateModel.empty()
 		for update in pair[1].getData():
 			self.__updateModel.addUpdate(update)
 

==== //depot/projects/soc2007/andrew-update/frontend/facund/gui/main_window.py#10 (text+ko) ====

@@ -114,7 +114,8 @@
 		self.__controller.installUpdates((dir.getName(), 'base'))
 
 	def onRemoveClick(self, widget):
-		self.__controller.installUpdates((dir.getName(), 'all'))
+		dir = self.__controller.getCurrentDirectory()
+		self.__controller.removeUpdates((dir.getName(), 'base'))
 
 	def onSelectComputer(self, widget):
 		'''Signal handler for when the selected item is changed'''