[pius-commit] pius pius,1.38,1.39

[Phil D. <ja...@us...>]

Update of /cvsroot/pgpius/pius
In directory vz-cvs-2.sog:/tmp/cvs-serv5820

Modified Files:
	pius 
Log Message:
Fix order of a function, bump version and copyright.

Signed-off-by: Phil Dibowitz <ph...@ip...>



Index: pius
===================================================================
RCS file: /cvsroot/pgpius/pius/pius,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- pius	13 Mar 2011 01:44:27 -0000	1.38
+++ pius	13 Mar 2011 01:47:22 -0000	1.39
@@ -5,7 +5,7 @@
 # vim:shiftwidth=2:tabstop=2:expandtab:textwidth=80:softtabstop=2:ai:
 
 #
-# Copyright (c) 2008 - 2010 Phil Dibowitz (ph...@ip...)
+# Copyright (c) 2008 - present Phil Dibowitz (ph...@ip...)
 #
 #   This program is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU General Public License as
@@ -34,7 +34,7 @@
 import subprocess
 import sys
 
-VERSION = '2.0.8'
+VERSION = '2.0.9'
 DEBUG_ON = False
 
 MODE_INTERACTIVE = 0
@@ -211,16 +211,16 @@
     '''Internal function to take a filename and put it in self.tmpdir.'''
     return '%s/%s' % (self.tmpdir, tfile)
 
-  def cleanup(self):
-    '''Cleanup all our temp files.'''
-    self._clean_files([self.tmp_keyring, ('%s~' % self.tmp_keyring)])
-
   def _clean_files(self, flist):
     '''Delete a list of files.'''
     for cfile in flist:
       if os.path.exists(cfile):
         os.unlink(cfile)
 
+  def cleanup(self):
+    '''Cleanup all our temp files.'''
+    self._clean_files([self.tmp_keyring, ('%s~' % self.tmp_keyring)])
+
   def get_all_keyids(self):
     '''Given a keyring, get all the KeyIDs from it.'''
     debug('extracting all keyids from keyring')