Skip to content

Commit 3e89d42

Browse files
author
nixnodes
committed
--dupelog option was ignored when calling macros
Signed-off-by: nixnodes <[email protected]>
1 parent 02d772d commit 3e89d42

9 files changed

+108
-77
lines changed

‎ChangeLog

+5-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
* 2.5.5:
2020
* - ! Avoid processing unecessary filters
2121
* 2.5.6:
22-
* - -[post|pre]print[f] overlapping
22+
* - ~ -[post|pre]print[f] overlapping
23+
* 2.5.7:
24+
* - + made altlog dumpable via -q
25+
* 2.5.8:
26+
* - ~ --dupelog option was ignored when calling macros
2327
*
2428
* v2.4:
2529
*

‎Makefile.in

+28-16
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.14.1 from Makefile.am.
1+
# Makefile.in generated by automake 1.15 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
1414

1515
@SET_MAKE@
1616
VPATH = @srcdir@
17-
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
17+
am__is_gnu_make = { \
18+
if test -z '$(MAKELEVEL)'; then \
19+
false; \
20+
elif test -n '$(MAKE_HOST)'; then \
21+
true; \
22+
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
23+
true; \
24+
else \
25+
false; \
26+
fi; \
27+
}
1828
am__make_running_with_option = \
1929
case $${target_option-} in \
2030
?) ;; \
@@ -76,14 +86,12 @@ NORMAL_UNINSTALL = :
7686
PRE_UNINSTALL = :
7787
POST_UNINSTALL = :
7888
subdir = .
79-
DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
80-
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
81-
$(top_srcdir)/configure $(am__configure_deps) COPYING compile \
82-
config.guess config.sub depcomp install-sh missing
8389
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8490
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
8591
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
8692
$(ACLOCAL_M4)
93+
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
94+
$(am__configure_deps) $(am__DIST_COMMON)
8795
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
8896
configure.lineno config.status.lineno
8997
mkinstalldirs = $(install_sh) -d
@@ -145,6 +153,9 @@ ETAGS = etags
145153
CTAGS = ctags
146154
CSCOPE = cscope
147155
DIST_SUBDIRS = $(SUBDIRS)
156+
am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \
157+
INSTALL NEWS README compile config.guess config.sub depcomp \
158+
install-sh missing
148159
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
149160
distdir = $(PACKAGE)-$(VERSION)
150161
top_distdir = $(distdir)
@@ -298,7 +309,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
298309
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
299310
$(am__cd) $(top_srcdir) && \
300311
$(AUTOMAKE) --gnu Makefile
301-
.PRECIOUS: Makefile
302312
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
303313
@case '$?' in \
304314
*config.status*) \
@@ -508,15 +518,15 @@ dist-xz: distdir
508518
$(am__post_remove_distdir)
509519

510520
dist-tarZ: distdir
511-
@echo WARNING: "Support for shar distribution archives is" \
512-
"deprecated." >&2
521+
@echo WARNING: "Support for distribution archives compressed with" \
522+
"legacy program 'compress' is deprecated." >&2
513523
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
514524
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
515525
$(am__post_remove_distdir)
516526

517527
dist-shar: distdir
518-
@echo WARNING: "Support for distribution archives compressed with" \
519-
"legacy program 'compress' is deprecated." >&2
528+
@echo WARNING: "Support for shar distribution archives is" \
529+
"deprecated." >&2
520530
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
521531
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
522532
$(am__post_remove_distdir)
@@ -552,17 +562,17 @@ distcheck: dist
552562
esac
553563
chmod -R a-w $(distdir)
554564
chmod u+w $(distdir)
555-
mkdir $(distdir)/_build $(distdir)/_inst
565+
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
556566
chmod a-w $(distdir)
557567
test -d $(distdir)/_build || exit 0; \
558568
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
559569
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
560570
&& am__cwd=`pwd` \
561-
&& $(am__cd) $(distdir)/_build \
562-
&& ../configure \
571+
&& $(am__cd) $(distdir)/_build/sub \
572+
&& ../../configure \
563573
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
564574
$(DISTCHECK_CONFIGURE_FLAGS) \
565-
--srcdir=.. --prefix="$$dc_install_base" \
575+
--srcdir=../.. --prefix="$$dc_install_base" \
566576
&& $(MAKE) $(AM_MAKEFLAGS) \
567577
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
568578
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -736,6 +746,8 @@ uninstall-am:
736746
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
737747
pdf-am ps ps-am tags tags-am uninstall uninstall-am
738748

749+
.PRECIOUS: Makefile
750+
739751

740752
dist-hook:
741753
cp -Rf $(SCRIPTS_DIST) $(distdir)/; \

‎NEWS

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
* 8/7/2014 (2.3.19_b2)
6060

6161
Added features which allow automated rebuilds of the dupefile, see
62-
<dupefile-rebuild> and <dupefile-rebuild> macros (macros.glutil).
62+
<dupefile-rebuild> macro (macros.glutil).
6363

6464
Mind that glutil binary must also be updated.
6565

@@ -92,11 +92,11 @@
9292

9393
Count up folder files and sizes from all dirlog records:
9494

95-
glutil -d --ilom "u64glob10 += size && u64glob11 += files" --postexec "echo 'Total size: {u64glob10} bytes, files: {u64glob11}'" --silent
95+
glutil -d -lom "u64glob10 += size && u64glob11 += files" -postprint "Total size: {u64glob10} bytes, files: {u64glob11}" --silent
9696

9797
Increment by one for each record matched (regex and LOM filters applied):
9898

99-
glutil -d --ilom "u64glob7 += 1" --iregex "a" --ilom "size != 0 && files != 0" --postexec "echo 'Results: {u64glob7}'"
99+
glutil -d -regex "ab" -lom "size != 0 && files != 0" -lom "u64glob7 += 1" -postprint "Results: {u64glob7}"
100100

101101
----------------------------------------------------------------------------------------------------------------------
102102

‎aclocal.m4

+35-32
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
1+
# generated automatically by aclocal 1.15 -*- Autoconf -*-
22

3-
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
3+
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
44

55
# This file is free software; the Free Software Foundation
66
# gives unlimited permission to copy and/or distribute it,
@@ -134,7 +134,7 @@ AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],
134134
| (ullmax / ull) | (ullmax % ull));]])
135135
])
136136

137-
# Copyright (C) 2002-2013 Free Software Foundation, Inc.
137+
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
138138
#
139139
# This file is free software; the Free Software Foundation
140140
# gives unlimited permission to copy and/or distribute it,
@@ -146,10 +146,10 @@ AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],
146146
# generated from the m4 files accompanying Automake X.Y.
147147
# (This private macro should not be called outside this file.)
148148
AC_DEFUN([AM_AUTOMAKE_VERSION],
149-
[am__api_version='1.14'
149+
[am__api_version='1.15'
150150
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
151151
dnl require some minimum version. Point them to the right macro.
152-
m4_if([$1], [1.14.1], [],
152+
m4_if([$1], [1.15], [],
153153
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
154154
])
155155

@@ -165,14 +165,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
165165
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
166166
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
167167
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
168-
[AM_AUTOMAKE_VERSION([1.14.1])dnl
168+
[AM_AUTOMAKE_VERSION([1.15])dnl
169169
m4_ifndef([AC_AUTOCONF_VERSION],
170170
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
171171
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
172172

173173
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
174174

175-
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
175+
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
176176
#
177177
# This file is free software; the Free Software Foundation
178178
# gives unlimited permission to copy and/or distribute it,
@@ -217,15 +217,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
217217
# configured tree to be moved without reconfiguration.
218218

219219
AC_DEFUN([AM_AUX_DIR_EXPAND],
220-
[dnl Rely on autoconf to set up CDPATH properly.
221-
AC_PREREQ([2.50])dnl
222-
# expand $ac_aux_dir to an absolute path
223-
am_aux_dir=`cd $ac_aux_dir && pwd`
220+
[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
221+
# Expand $ac_aux_dir to an absolute path.
222+
am_aux_dir=`cd "$ac_aux_dir" && pwd`
224223
])
225224

226225
# AM_CONDITIONAL -*- Autoconf -*-
227226

228-
# Copyright (C) 1997-2013 Free Software Foundation, Inc.
227+
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
229228
#
230229
# This file is free software; the Free Software Foundation
231230
# gives unlimited permission to copy and/or distribute it,
@@ -256,7 +255,7 @@ AC_CONFIG_COMMANDS_PRE(
256255
Usually this means the macro was only invoked conditionally.]])
257256
fi])])
258257

259-
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
258+
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
260259
#
261260
# This file is free software; the Free Software Foundation
262261
# gives unlimited permission to copy and/or distribute it,
@@ -447,7 +446,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
447446

448447
# Generate code to set up dependency tracking. -*- Autoconf -*-
449448

450-
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
449+
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
451450
#
452451
# This file is free software; the Free Software Foundation
453452
# gives unlimited permission to copy and/or distribute it,
@@ -523,7 +522,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
523522

524523
# Do all the work for Automake. -*- Autoconf -*-
525524

526-
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
525+
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
527526
#
528527
# This file is free software; the Free Software Foundation
529528
# gives unlimited permission to copy and/or distribute it,
@@ -613,8 +612,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
613612
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
614613
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
615614
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
616-
# We need awk for the "check" target. The system "awk" is bad on
617-
# some platforms.
615+
# We need awk for the "check" target (and possibly the TAP driver). The
616+
# system "awk" is bad on some platforms.
618617
AC_REQUIRE([AC_PROG_AWK])dnl
619618
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
620619
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -687,7 +686,11 @@ to "yes", and re-run configure.
687686
END
688687
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
689688
fi
690-
fi])
689+
fi
690+
dnl The trailing newline in this macro's definition is deliberate, for
691+
dnl backward compatibility and to allow trailing 'dnl'-style comments
692+
dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
693+
])
691694

692695
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
693696
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -716,7 +719,7 @@ for _am_header in $config_headers :; do
716719
done
717720
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
718721

719-
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
722+
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
720723
#
721724
# This file is free software; the Free Software Foundation
722725
# gives unlimited permission to copy and/or distribute it,
@@ -727,7 +730,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
727730
# Define $install_sh.
728731
AC_DEFUN([AM_PROG_INSTALL_SH],
729732
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
730-
if test x"${install_sh}" != xset; then
733+
if test x"${install_sh+set}" != xset; then
731734
case $am_aux_dir in
732735
*\ * | *\ *)
733736
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -737,7 +740,7 @@ if test x"${install_sh}" != xset; then
737740
fi
738741
AC_SUBST([install_sh])])
739742

740-
# Copyright (C) 2003-2013 Free Software Foundation, Inc.
743+
# Copyright (C) 2003-2014 Free Software Foundation, Inc.
741744
#
742745
# This file is free software; the Free Software Foundation
743746
# gives unlimited permission to copy and/or distribute it,
@@ -759,7 +762,7 @@ AC_SUBST([am__leading_dot])])
759762
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
760763
# From Jim Meyering
761764

762-
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
765+
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
763766
#
764767
# This file is free software; the Free Software Foundation
765768
# gives unlimited permission to copy and/or distribute it,
@@ -794,7 +797,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
794797

795798
# Check to see how 'make' treats includes. -*- Autoconf -*-
796799

797-
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
800+
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
798801
#
799802
# This file is free software; the Free Software Foundation
800803
# gives unlimited permission to copy and/or distribute it,
@@ -844,7 +847,7 @@ rm -f confinc confmf
844847

845848
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
846849

847-
# Copyright (C) 1997-2013 Free Software Foundation, Inc.
850+
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
848851
#
849852
# This file is free software; the Free Software Foundation
850853
# gives unlimited permission to copy and/or distribute it,
@@ -883,7 +886,7 @@ fi
883886

884887
# Helper functions for option handling. -*- Autoconf -*-
885888

886-
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
889+
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
887890
#
888891
# This file is free software; the Free Software Foundation
889892
# gives unlimited permission to copy and/or distribute it,
@@ -912,7 +915,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
912915
AC_DEFUN([_AM_IF_OPTION],
913916
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
914917

915-
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
918+
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
916919
#
917920
# This file is free software; the Free Software Foundation
918921
# gives unlimited permission to copy and/or distribute it,
@@ -959,7 +962,7 @@ AC_LANG_POP([C])])
959962
# For backward compatibility.
960963
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
961964

962-
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
965+
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
963966
#
964967
# This file is free software; the Free Software Foundation
965968
# gives unlimited permission to copy and/or distribute it,
@@ -978,7 +981,7 @@ AC_DEFUN([AM_RUN_LOG],
978981

979982
# Check to make sure that the build environment is sane. -*- Autoconf -*-
980983

981-
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
984+
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
982985
#
983986
# This file is free software; the Free Software Foundation
984987
# gives unlimited permission to copy and/or distribute it,
@@ -1059,7 +1062,7 @@ AC_CONFIG_COMMANDS_PRE(
10591062
rm -f conftest.file
10601063
])
10611064

1062-
# Copyright (C) 2009-2013 Free Software Foundation, Inc.
1065+
# Copyright (C) 2009-2014 Free Software Foundation, Inc.
10631066
#
10641067
# This file is free software; the Free Software Foundation
10651068
# gives unlimited permission to copy and/or distribute it,
@@ -1119,7 +1122,7 @@ AC_SUBST([AM_BACKSLASH])dnl
11191122
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
11201123
])
11211124

1122-
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
1125+
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
11231126
#
11241127
# This file is free software; the Free Software Foundation
11251128
# gives unlimited permission to copy and/or distribute it,
@@ -1147,7 +1150,7 @@ fi
11471150
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
11481151
AC_SUBST([INSTALL_STRIP_PROGRAM])])
11491152

1150-
# Copyright (C) 2006-2013 Free Software Foundation, Inc.
1153+
# Copyright (C) 2006-2014 Free Software Foundation, Inc.
11511154
#
11521155
# This file is free software; the Free Software Foundation
11531156
# gives unlimited permission to copy and/or distribute it,
@@ -1166,7 +1169,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
11661169

11671170
# Check how to create a tarball. -*- Autoconf -*-
11681171

1169-
# Copyright (C) 2004-2013 Free Software Foundation, Inc.
1172+
# Copyright (C) 2004-2014 Free Software Foundation, Inc.
11701173
#
11711174
# This file is free software; the Free Software Foundation
11721175
# gives unlimited permission to copy and/or distribute it,

0 commit comments

Comments
 (0)