sort the output of certmaster-ca before displaying them

[certmaster.git] / scripts / certmaster-ca

diff --git a/scripts/certmaster-ca b/scripts/certmaster-ca
index 7370ef3..d10c1a2 100755 (executable)
--- a/scripts/certmaster-ca
+++ b/scripts/certmaster-ca
@@ -7,6 +7,7 @@
 
 import sys
 import glob
+import optparse
 import os
 
 import certmaster
@@ -15,15 +16,17 @@ import certmaster.certmaster
 
 
 
-from optparse import OptionParser
 
 def errorprint(stuff):
     print >> sys.stderr, stuff
 
+class CertmasterCAOptionParser(optparse.OptionParser):
+    def get_version(self):
+        return file("/etc/func/version").read().strip()
 
 def parseargs(args):
     usage = 'certmaster-ca <option> [args]'
-    parser = OptionParser(usage=usage)
+    parser = CertmasterCAOptionParser(usage=usage,version=True)
     
     parser.add_option('-l', '--list', default=False, action="store_true",
           help='list signing requests remaining')
@@ -60,7 +63,7 @@ def main(args):
     if opts.list:
         hns = cm.get_csrs_waiting()
         if hns:
-            for hn in cm.get_csrs_waiting():
+            for hn in sorted(hns):
                 print hn
         else:
            print 'No certificates to sign'
@@ -101,7 +104,7 @@ def main(args):
 
         signed_certs = cm.get_signed_certs(args)
 
-        for i in signed_certs:
+        for i in sorted(signed_certs):
             print i
             
         return 0
@@ -113,7 +116,7 @@ def main(args):
             
         cert_hashes = cm.get_cert_hashes(hostglobs)
 
-        for i in cert_hashes:
+        for i in sorted(cert_hashes):
             print i
             
         return 0