@@ -14,6 +14,7 @@ from HashCache import HashCache

 from logging import debug, info, warning, error

 import os

+import sys

 import glob

 import copy

@@ -150,14 +151,23 @@ def _get_filelist_from_file(cfg, local_path):

     filelist = {}

     for fname in cfg.files_from:

-        f = open(fname, 'r')

+        if fname == u'-':

+            f = sys.stdin

+        else:

+            try:

+                f = open(fname, 'r')

+            except IOError, e:

+                warning(u"--files-from input file %s could not be opened for reading (%s), skipping." % (fname, e.strerror))

+                continue

+                

         for line in f:

             line = line.strip()

             line = os.path.normpath(os.path.join(local_path, line))

             dirname = os.path.dirname(line)

             basename = os.path.basename(line)

             _append(filelist, dirname, basename)

-        f.close()

+        if f != sys.stdin:

+            f.close()

     # reformat to match os.walk()

     result = []

@@ -1738,7 +1738,7 @@ def main():

     optparser.add_option(      "--rinclude", dest="rinclude", action="append", metavar="REGEXP", help="Same as --include but uses REGEXP (regular expression) instead of GLOB")

     optparser.add_option(      "--rinclude-from", dest="rinclude_from", action="append", metavar="FILE", help="Read --rinclude REGEXPs from FILE")

-    optparser.add_option(      "--files-from", dest="files_from", action="append", metavar="FILE", help="Read list of source-file names from FILE")

+    optparser.add_option(      "--files-from", dest="files_from", action="append", metavar="FILE", help="Read list of source-file names from FILE. Use - to read from stdin.")

     optparser.add_option(      "--bucket-location", dest="bucket_location", help="Datacentre to create bucket in. As of now the datacenters are: US (default), EU, ap-northeast-1, ap-southeast-1, sa-east-1, us-west-1 and us-west-2")

     optparser.add_option(      "--reduced-redundancy", "--rr", dest="reduced_redundancy", action="store_true", help="Store object with 'Reduced redundancy'. Lower per-GB price. [put, cp, mv]")