Merge remote-tracking branch 'github/master' into setuptools-script

Conflicts:
	README.md
	letsencrypt.py

README.md

@@ -21,22 +21,19 @@ conf layout.
 
 `python setup.py develop --user`
 
-
 ## Command line usage
 
-sudo ./letsencrypt.py  (default authentication mode using pythondialog)
-                                                   
-options --text (text mode)                              
+```
+sudo ./letsencrypt.py  (default authentication mode using pythondialog) options 
+
+--text (text mode)                              
 --privkey= (specify privatekey file to use to generate the certificate)            
---csr= (Use a specific CSR. If this is specified, privkey must also be             
-specified with the correct private key for the CSR)                                
---server (list the ACME CA server address)                       
---revoke (revoke a certificate)                                                    
---view-checkpoints (Used to view available checkpoints and see what                
-configuration changes have been made)                                              
+--csr= (Use a specific CSR. If this is specified, privkey must also be specified with the correct private key for the CSR)                             
+--server (list the ACME CA server address)
+--revoke (revoke a certificate)
+--view-checkpoints (Used to view available checkpoints and see what configuration changes have been made)
 --rollback=X (Revert the configuration X number of checkpoints)                    
---redirect (Automatically redirect all HTTP traffic to HTTPS for the newly         
-authenticated vhost)                                                               
---no-redirect (Skip the HTTPS redirect question, allowing both HTTP and            
-HTTPS)                                                                             
+--redirect (Automatically redirect all HTTP traffic to HTTPS for the newly authenticated vhost)                   
+--no-redirect (Skip the HTTPS redirect question, allowing both HTTP and HTTPS)
 --agree-eula (Skip the end user agreement screen)
+```

letsencrypt/client/client.py

@@ -79,7 +79,7 @@ class Client(object):
             # found within the config to self.names
             # Then filters them based on user selection
             code, self.names = display.filter_names(self.get_all_names())
-            if code == display.OK:
+            if code == display.OK and self.names:
                 # TODO: Allow multiple names once it is setup
                 self.names = [self.names[0]]
             else:

letsencrypt/scripts/main.py

@@ -96,7 +96,7 @@ def usage():
     s = "Available options: --text, --privkey=, --csr=, --server=, "
     s += "--rollback=, --view-checkpoints, --revoke, --agree-eula, --redirect,"
     s += " --no-redirect, --help"
-    print str
+    print s
 
 def print_options():
     print "\nsudo ./letsencrypt.py (default authentication mode using pythondialog)"

requirements.txt

@@ -1,5 +1,5 @@
 M2Crypto==0.22.3
-pythondialog==2.7
+python2-pythondialog
 jose==0.1
 jsonschema==2.4.0
 #python-augeas==0.5.0