diff options
-rw-r--r-- | lib/replace/wscript | 4 | ||||
-rw-r--r-- | pidl/wscript | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript index 3d47c375044..8e2873424be 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -787,8 +787,8 @@ def build(bld): REPLACE_HOSTCC_SOURCE = '' - for filename, functions in REPLACEMENT_FUNCTIONS.iteritems(): - for function in functions: + for filename in REPLACEMENT_FUNCTIONS.keys(): + for function in REPLACEMENT_FUNCTIONS[filename]: if not bld.CONFIG_SET('HAVE_%s' % function.upper()): REPLACE_HOSTCC_SOURCE += ' %s' % filename break diff --git a/pidl/wscript b/pidl/wscript index 39816112133..adfbfe0eb37 100644 --- a/pidl/wscript +++ b/pidl/wscript @@ -59,15 +59,16 @@ def build(bld): 'lib/Parse/Pidl/Wireshark/NDR.pm': 'man3/Parse::Pidl::Wireshark::NDR.${PERLMAN3EXT}' } - for k, v in pidl_manpages.iteritems(): - pidl_manpages[k] = bld.EXPAND_VARIABLES(v) + for k in pidl_manpages.keys(): + pidl_manpages[k] = bld.EXPAND_VARIABLES(pidl_manpages[k]) # use perl to build the manpages bld.env.pidl_srcdir = os.path.join(bld.srcnode.abspath(), 'pidl') bld.SET_BUILD_GROUP('final') if 'POD2MAN' in bld.env and bld.env['POD2MAN'] != '': - for src, manpage in pidl_manpages.iteritems(): + for src in pidl_manpages.keys(): + manpage = pidl_manpages[src] section = string.rsplit(manpage, ".", 1)[1] bld(rule='${POD2MAN} -c "Samba Documentation" -s %s ${SRC} ${TGT}' % section, shell=True, |