diff options
Diffstat (limited to 'bin/unshunt')
| -rw-r--r-- | bin/unshunt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/bin/unshunt b/bin/unshunt index 8b675587..8c1c117f 100644 --- a/bin/unshunt +++ b/bin/unshunt @@ -1,6 +1,6 @@ #! @PYTHON@ -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2006 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -14,7 +14,8 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. """Move a message from the shunt queue to the original queue. @@ -69,6 +70,7 @@ def main(): usage(1) sb = get_switchboard(qdir) + sb.recover_backup_files() for filebase in sb.files(): try: msg, msgdata = sb.dequeue(filebase) @@ -80,6 +82,9 @@ def main(): # other shunted messages. print >> sys.stderr, _( 'Cannot unshunt message %(filebase)s, skipping:\n%(e)s') + else: + # Unlink the .bak file left by dequeue() + sb.finish(filebase) |