Start intro if config is absent or corrupted.

Cleanups.

2 files changed, 8 insertions, 6 deletions

diff --git a/shell/intro/intro.py b/shell/intro/intro.py
index 99e1890..b760c81 100644
--- a/shell/intro/intro.py
+++ b/shell/intro/intro.py
@@ -232,10 +232,13 @@ class IntroWindow(gtk.Window):
         # Generate keypair
         import commands
         keypath = os.path.join(env.get_profile_path(), "owner.key")
-        cmd = "ssh-keygen -q -t dsa -f %s -C '' -N ''" % keypath
-        (s, o) = commands.getstatusoutput(cmd)
-        if s != 0:
-            logging.error("Could not generate key pair: %d" % s)
+        if not os.path.isfile(keypath):
+            cmd = "ssh-keygen -q -t dsa -f %s -C '' -N ''" % keypath
+            (s, o) = commands.getstatusoutput(cmd)
+            if s != 0:
+                logging.error("Could not generate key pair: %d" % s)
+        else:
+            logging.error("Keypair exists, skip generation.")
 
         gtk.main_quit()
         return False
diff --git a/shell/sugar-shell b/shell/sugar-shell
index 8bd3dd0..8d9fd2f 100755
--- a/shell/sugar-shell
+++ b/shell/sugar-shell
@@ -74,8 +74,7 @@ _start_matchbox()
 _setup_translations()
 
 # Do initial setup if needed
-key = profile.get_pubkey() 
-if not key or not len(key):
+if not profile.is_valid():
 	win = intro.IntroWindow()
 	win.show_all()
 	gtk.main()