launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

Andres Rodriguez has proposed merging lp:~andreserl/maas/maas_lp1040047 into lp:maas.

Requested reviews:
  MAAS Maintainers (maas-maintainers)
Related bugs:
  Bug #1040047 in MAAS: "MAAS fails to start because it doesn't find dnssec-keygen"
  https://bugs.launchpad.net/maas/+bug/1040047

For more details, see:
https://code.launchpad.net/~andreserl/maas/maas_lp1040047/+merge/120769
-- 
https://code.launchpad.net/~andreserl/maas/maas_lp1040047/+merge/120769
Your team MAAS Maintainers is requested to review the proposed merge of lp:~andreserl/maas/maas_lp1040047 into lp:maas.

=== modified file 'src/provisioningserver/omshell.py'
--- src/provisioningserver/omshell.py	2012-08-07 10:20:38 +0000
+++ src/provisioningserver/omshell.py	2012-08-22 13:35:57 +0000
@@ -32,8 +32,12 @@
 
 
 def call_dnssec_keygen(tmpdir):
+    dnssec_keygen = 'dnssec-keygen'
+    if os.path.exists('/usr/sbin/dnssec-keygen'):
+        dnssec_keygen = '/usr/sbin/dnssec-keygen'
+
     return check_output(
-        ['dnssec-keygen', '-r', '/dev/urandom', '-a', 'HMAC-MD5',
+        [dnssec_keygen, '-r', '/dev/urandom', '-a', 'HMAC-MD5',
          '-b', '512', '-n', 'HOST', '-K', tmpdir, '-q', 'omapi_key'])