If the file specified with -f is "-", read addresses to remove from

  stdin (in addition to those specified on the command line).

1 files changed, 13 insertions, 6 deletions

diff --git a/bin/remove_members b/bin/remove_members
index 991443752..26b3bc2f9 100755
--- a/bin/remove_members
+++ b/bin/remove_members
@@ -25,7 +25,8 @@ Where:
 
     --file file
     -f file
-        Remove member addresses found in the given file.
+        Remove member addresses found in the given file.  If file is
+        `-', read stdin.
 
     --help
     -h
@@ -50,6 +51,15 @@ def usage(status, msg=''):
         print msg
     sys.exit(status)
 
+def ReadFile(filename):
+    lines = []
+    if filename == "-":
+        fp = sys.stdin
+    else:
+        fp = open(filename)
+    lines = filter(None, map(string.strip, fp.readlines()))
+    fp.close()
+    return lines
 
 
 def main():
@@ -76,13 +86,10 @@ def main():
                 
     if filename:
         try:
-            fp = open(filename)
-            addresses = addresses + \
-                        filter(None, map(string.strip, fp.readlines()))
-            fp.close()
+            addresses = addresses + ReadFile(filename)
         except IOError:
             print 'Could not open file for reading: %s.  Ignoring...' % \
-                  filename
+                  `filename`
 
     try:
         # open locked