Merge lp:~lifeless/hydrazine/staging into lp:hydrazine

[Robert Collins]

This branch:
 - makes it possible to use hydrazine against staging
 - fixes the bug where a project with no approved merges blows up feed-pqm

=== modified file 'feed-pqm'
--- feed-pqm	2010-03-29 05:21:17 +0000
+++ feed-pqm	2010-04-12 04:49:14 +0000
@@ -17,11 +17,11 @@
 
 import datetime
 import os
-import subprocess
 import sys
 
+from bzrlib.email_message import EmailMessage
 from bzrlib.config import GlobalConfig
-from bzrlib.email_message import EmailMessage
+from bzrlib import gpg
 from bzrlib.smtp_connection import SMTPConnection
 
 import hydrazine
@@ -105,18 +105,11 @@
     except KeyError:
         my_email = launchpad.me.preferred_email_address.email
         print "EMAIL environment variable not set, using %s" % my_email
-    child = subprocess.Popen(
-        ['gpg', '--clearsign', '-a'],
-        stdin=subprocess.PIPE,
-        stdout=subprocess.PIPE)
-    signed_message = child.communicate(
-        raw_message)[0]
-    if child.returncode != 0:
-        print "gpg child failed"
-
+    config = GlobalConfig()
+    signer = gpg.GPGStrategy(config)
+    signed_message = signer.sign(raw_message.encode('utf8'))
     message = EmailMessage(my_email, PQM_ADDRESS, mp.commit_message, 
                            signed_message)
-    config = GlobalConfig()
     SMTPConnection(config).send_email(message)
 
     print "Sent!"
@@ -138,6 +131,7 @@
     all_mps = list(project.getMergeProposals(status=['Approved']))
     if all_mps == []:
         print "Nothing approved to merge?"
+	return
     while True:
         mp = all_mps[i]
         show_mp(mp)

=== modified file 'hydrazine/__init__.py'
--- hydrazine/__init__.py	2010-03-02 05:39:02 +0000
+++ hydrazine/__init__.py	2010-04-12 04:49:14 +0000
@@ -11,7 +11,7 @@
     EDGE_SERVICE_ROOT,
     )
 
-service_root = EDGE_SERVICE_ROOT
+service_root = os.environ.get('LAUNCHPAD_API', EDGE_SERVICE_ROOT)
 
 
 def trace(s):