From 5a373a388bfd0099ac2a8b9f70e07bcf921b5ccf Mon Sep 17 00:00:00 2001
From: tomas <tomas@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Mon, 10 Jan 2005 03:35:06 +0000
Subject: [PATCH] Uninstall order fixed.

---
 .../storageServer/var/install/uninstall.php   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/livesupport/modules/storageServer/var/install/uninstall.php b/livesupport/modules/storageServer/var/install/uninstall.php
index 0609a9631..bb66b1029 100644
--- a/livesupport/modules/storageServer/var/install/uninstall.php
+++ b/livesupport/modules/storageServer/var/install/uninstall.php
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.5 $
+    Version  : $Revision: 1.6 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/install/uninstall.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -54,17 +54,7 @@ if(PEAR::isError($dbc)){
 
 $dbc->setFetchMode(DB_FETCHMODE_ASSOC);
 $gb = &new GreenBox(&$dbc, $config);
-
 #    $dbc->setErrorHandling(PEAR_ERROR_RETURN);
-echo "# Trying to uninstall storageServer ...\n";
-$gb->uninstall();
-
-echo "# Uninstall Transport submodule ...\n";
-require_once "../Transport.php";
-$tr =& new Transport(&$dbc, $config);
-$r = $tr->uninstall();
-if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit; }
-echo "\n";
 
 echo "# Uninstall Prefs submodule\n";
 require_once "../Prefs.php";
@@ -73,5 +63,15 @@ $r = $pr->uninstall();
 if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit; }
 echo "\n";
 
+echo "# Uninstall Transport submodule ...\n";
+require_once "../Transport.php";
+$tr =& new Transport(&$dbc, $config);
+$r = $tr->uninstall();
+if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit; }
+echo "\n";
+
+echo "# StorageServer uninstall ...\n";
+$gb->uninstall();
+
 $dbc->disconnect();
 ?>