fix 'add reference' bug and removed .net - admin account warning from 7.1

    installer

1 files changed, 6 insertions, 6 deletions

diff --git a/cpp/install/common/components.py b/cpp/install/common/components.py
index cb4dc1a96d9..610e999930c 100755
--- a/cpp/install/common/components.py
+++ b/cpp/install/common/components.py
@@ -48,6 +48,7 @@ def recursiveListing(path):
     for x in files:
         fullpath = os.path.join(path, x);
         if os.path.isdir(fullpath) and not os.path.islink(fullpath):
+            result.append(fullpath)
             result.extend(recursiveListing(fullpath))
         else:
             result.append(fullpath)
@@ -97,7 +98,7 @@ class FileSpecWorker:
                 if f.endswith("/**"):
                     midmatchIncludes.append(".*%s.*" %f[3:len(f) -3].replace('/', '.'))
                 else:
-                    recursiveIncludes.append(f[3:])
+                    recursiveIncludes.append("*%s" % f[3:])
             else:
                 if f.endswith("/**"):
                     midmatchIncludes.append("%s.*" %f[0:len(f) -3].replace('/', '.'))
@@ -109,7 +110,7 @@ class FileSpecWorker:
                 if f.endswith("/**"):
                     midmatchExcludes.append(".*%s.*" % f[3:len(f) -3].replace('/', '.'))
                 else:
-                    recursiveExcludes.append(f[3:])
+                    recursiveExcludes.append("*%s" % f[3:])
             else:
                 if f.endswith("/**"):
                     midmatchExcludes.append("%s.*" %f[0:len(f) -3].replace('/', '.'))
@@ -208,10 +209,9 @@ class FileSpecWorker:
             cachedResults = cacheFile.readlines()
             cacheFile.close()
 
-        for i in range(0, len(cachedResults)):
-            cachedResults[i] = cachedResults[i].rstrip()
-
         if cachedResults != None:
+            for i in range(0, len(cachedResults)):
+                cachedResults[i] = cachedResults[i].rstrip()
             previous = set(cachedResults)
             current = set(result)
             added = current - previous
@@ -371,7 +371,7 @@ def stage(filename, componentdir, stageDirectory, group, defaults):
 
                     componentFile = file(filename, "r")
                     try:
-                        worker = FileSpecWorker(filename, source, os.path.join(currentBase, dest))
+                        worker = FileSpecWorker("%s.%s.%d" % (filename, section.replace(" ", "_"), i), source, os.path.join(currentBase, dest))
                         for line in componentFile:
                             current = line.strip()
                             if line.startswith('#'):