Revert (and improve) #89d49c8e48
Michal Ludvig authored on 2013/02/19 09:00:08... | ... |
@@ -80,7 +80,8 @@ def filter_exclude_include(src_list): |
80 | 80 |
exclude_list[file] = src_list[file] |
81 | 81 |
del(src_list[file]) |
82 | 82 |
continue |
83 |
- |
|
83 |
+ else: |
|
84 |
+ debug(u"PASS: %r" % (file)) |
|
84 | 85 |
return src_list, exclude_list |
85 | 86 |
|
86 | 87 |
def handle_exclude_include_walk(root, dirs, files): |
... | ... |
@@ -92,6 +93,7 @@ def handle_exclude_include_walk(root, dirs, files): |
92 | 92 |
# this prevents us from recursing down trees we know we want to ignore |
93 | 93 |
for x in copydirs: |
94 | 94 |
d = os.path.join(root, x, '') |
95 |
+ debug(u"CHECK: %r" % d) |
|
95 | 96 |
excluded = False |
96 | 97 |
for r in cfg.exclude: |
97 | 98 |
if r.search(d): |
... | ... |
@@ -107,12 +109,16 @@ def handle_exclude_include_walk(root, dirs, files): |
107 | 107 |
break |
108 | 108 |
if excluded: |
109 | 109 |
## Still excluded - ok, action it |
110 |
+ debug(u"EXCLUDE: %r" % d) |
|
110 | 111 |
dirs.remove(x) |
111 | 112 |
continue |
113 |
+ else: |
|
114 |
+ debug(u"PASS: %r" % (d)) |
|
112 | 115 |
|
113 | 116 |
# exclude file matches in the current directory |
114 | 117 |
for x in copyfiles: |
115 | 118 |
file = os.path.join(root, x) |
119 |
+ debug(u"CHECK: %r" % file) |
|
116 | 120 |
excluded = False |
117 | 121 |
for r in cfg.exclude: |
118 | 122 |
if r.search(file): |
... | ... |
@@ -131,6 +137,8 @@ def handle_exclude_include_walk(root, dirs, files): |
131 | 131 |
debug(u"EXCLUDE: %s" % file) |
132 | 132 |
files.remove(x) |
133 | 133 |
continue |
134 |
+ else: |
|
135 |
+ debug(u"PASS: %r" % (file)) |
|
134 | 136 |
|
135 | 137 |
def fetch_local_list(args, recursive = None): |
136 | 138 |
def _get_filelist_local(loc_list, local_uri, cache): |