Merge lp:~jml/launchpad/rf-setup-cleanup into lp:launchpad

[Jonathan Lange]

Remove unnecessary SSH setup from rocketfuel-setup

[Jonathan Lange (jml)]

Remove unnecessary SSH stuff from rocketfuel setup. Do I need to saying anything more?

[Michael Hudson-Doyle (mwhudson)]

YES PLEASE

review: Approve

=== modified file 'lib/devscripts/autoland.py'
--- lib/devscripts/autoland.py	2009-10-08 23:22:16 +0000
+++ lib/devscripts/autoland.py	2009-11-12 08:12:15 +0000
@@ -230,14 +230,15 @@
         returned by 'get_reviews'.
     :return: A string like u'[r=foo,bar][ui=plop]'.
     """
-    # If no review type is specified it will be None and is assumed to be a
-    # code review.
+    # If no review type is specified it is assumed to be a code review.
     code_reviewers = reviewers.get(None, [])
     ui_reviewers = []
     rc_reviewers = []
     for review_type, reviewer in reviewers.items():
         if review_type is None:
             continue
+        if review_type == '':
+            code_reviewers.extend(reviewer)
         if 'code' in review_type or 'db' in review_type:
             code_reviewers.extend(reviewer)
         if 'ui' in review_type:

=== modified file 'utilities/rocketfuel-setup'
--- utilities/rocketfuel-setup	2009-10-20 11:29:26 +0000
+++ utilities/rocketfuel-setup	2009-11-12 08:12:15 +0000
@@ -165,77 +165,6 @@
     exit 1
 fi
 
-if [ ! -e ~/.ssh/config ]; then
-    touch ~/.ssh/config
-fi
-
-ssh_config_mod=0
-grep -q "^GSSAPIAuthentication" ~/.ssh/config
-if [ $? -ne 0 ]; then
-  ssh_config_mod=1
-  echo "Please add the following directive to your ~/.ssh/config:
-------------------------------------------------------------
-GSSAPIAuthentication no
-------------------------------------------------------------
-
-  (Hit Return when done...)
-"
-fi
-if [ "$whoami" != "$lpusername" ]; then
-  if [ "$ssh_config_mod" -ne "0" ]
-  then
-    intro="Also ensure"
-  else
-    ssh_config_mod=1
-    intro="Ensure"
-  fi
-  echo "$intro the following directive is in your ~/.ssh/config:
-------------------------------------------------------------
-Host bazaar.launchpad.net
-    User $lpusername
-------------------------------------------------------------
-
-  (Hit Return when done...)
-"
-fi
-
-if [ "$ssh_config_mod" -ne "0" ]; then
-  read
-fi
-
-grep -q "^Host .*bazaar.launchpad.dev" ~/.ssh/config
-if [ $? -ne 0 ]; then
-  echo "Please add the following directives to your ~/.ssh/config:
-------------------------------------------------------------
-Host bazaar.launchpad.dev
-    Hostname launchpad.dev
-    HostKeyAlias bazaar.launchpad.dev
-    User mark
-    Port 5022
-    IdentityFile ~/.ssh/launchpad_id_dsa
-------------------------------------------------------------
-
-  (Hit Return when done...)
-"
-  read
-fi
-
-# This is not strictly needed for bzr versions >= 1.9 but it's included
-# here for backwards compatibility.
-grep -q "^Host .*bazaar.launchpad.net" ~/.ssh/config
-if [ $? -ne 0 ]; then
-  echo "Please add the following directives to your ~/.ssh/config:
-------------------------------------------------------------
-Host bazaar.launchpad.net
-    User ${lpusername}
-------------------------------------------------------------
-
-  (Hit Return when done...)
-"
-  read
-fi
-
-
 LPDEV_SOURCES="/etc/apt/sources.list.d/launchpad-dev.list"
 if [ ! -e $LPDEV_SOURCES ]; then
   sudo touch $LPDEV_SOURCES
@@ -431,13 +360,6 @@
 
 fi
 
-# Set up access to the local supermirror
-if [ ! -e ~/.ssh/launchpad_id_dsa ]; then
-  cp $LP_TRUNK_PATH/lib/lp/codehosting/tests/id_dsa ~/.ssh/launchpad_id_dsa
-  chmod 600 ~/.ssh/launchpad_id_dsa
-  echo "Set up ssh key for local supermirror ssh access."
-fi
-
 # Set up scripts in /usr/local/bin
 cd /usr/local/bin
 if [ ! -e rocketfuel-get ]; then