aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/lib
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-04-14 00:20:56 -0700
committerMcCabe Maxsted2010-04-14 00:20:56 -0700
commit834a60163bba95d53c297c791e49a597b87144f3 (patch)
tree0dc2c00c07be28940a72011ef9291cd817a2c0d5 /linden/indra/lib
parentAdded prim media functions and new script functions from SL server 1.38.0 (diff)
parentfix bring help-f1 page under control of hippogridmanager (diff)
downloadmeta-impy-834a60163bba95d53c297c791e49a597b87144f3.zip
meta-impy-834a60163bba95d53c297c791e49a597b87144f3.tar.gz
meta-impy-834a60163bba95d53c297c791e49a597b87144f3.tar.bz2
meta-impy-834a60163bba95d53c297c791e49a597b87144f3.tar.xz
Merge commit 'armin/beta2-bugfixes' into 1.3-beta2bugfixes
Diffstat (limited to 'linden/indra/lib')
-rw-r--r--linden/indra/lib/python/indra/util/llmanifest.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py
index 369cc81..7a2505d 100644
--- a/linden/indra/lib/python/indra/util/llmanifest.py
+++ b/linden/indra/lib/python/indra/util/llmanifest.py
@@ -608,7 +608,7 @@ class LLManifest(object):
608 d = src_re.sub(d_template, s.replace('\\', '/')) 608 d = src_re.sub(d_template, s.replace('\\', '/'))
609 yield os.path.normpath(s), os.path.normpath(d) 609 yield os.path.normpath(s), os.path.normpath(d)
610 610
611 def path(self, src, dst=None): 611 def path(self, src, dst=None, required=True):
612 sys.stdout.write("Processing %s => %s ... " % (src, dst)) 612 sys.stdout.write("Processing %s => %s ... " % (src, dst))
613 sys.stdout.flush() 613 sys.stdout.flush()
614 if src == None: 614 if src == None:
@@ -625,9 +625,10 @@ class LLManifest(object):
625 assert(s != d) 625 assert(s != d)
626 count += self.process_file(s, d) 626 count += self.process_file(s, d)
627 else: 627 else:
628 # if we're specifying a single path (not a glob), 628 # if we're specifying a single path (not a glob), and
629 # we should error out if it doesn't exist 629 # it's required, error out if it doesn't exist
630 self.check_file_exists(src) 630 if required:
631 self.check_file_exists(src)
631 # if it's a directory, recurse through it 632 # if it's a directory, recurse through it
632 if os.path.isdir(src): 633 if os.path.isdir(src):
633 count += self.process_directory(src, dst) 634 count += self.process_directory(src, dst)