Module Name: src
Committed By: uebayasi
Date: Tue Dec 15 05:11:08 UTC 2009
Modified Files:
src/distrib/sets: sets.subr
Log Message:
Factor out print_set_files() printing raw set list entries out of
list_set_files(). While here kill a useless-use-of-cat.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/distrib/sets/sets.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.115 src/distrib/sets/sets.subr:1.116
--- src/distrib/sets/sets.subr:1.115 Tue Dec 15 05:07:11 2009
+++ src/distrib/sets/sets.subr Tue Dec 15 05:11:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.115 2009/12/15 05:07:11 uebayasi Exp $
+# $NetBSD: sets.subr,v 1.116 2009/12/15 05:11:08 uebayasi Exp $
#
#
@@ -173,7 +173,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.115 2009/12/15 05:07:11 uebayasi Exp $
+# # $NetBSD: sets.subr,v 1.116 2009/12/15 05:11:08 uebayasi Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -260,15 +260,7 @@
else
verbose=true
fi
- for setname; do
- list=`list_set_lists $setname`
- for l in $list; do
- echo $l
- if $verbose; then
- echo >&2 "DEBUG: list_set_files: $l"
- fi
- done
- done | xargs cat | ${SED} ${SUBST} | \
+ print_set_lists "$@" | \
${AWK} -v obsolete=${obsolete} '
BEGIN {
if (obsolete)
@@ -475,6 +467,19 @@
done
}
+print_set_lists()
+{
+ for setname; do
+ list=`list_set_lists $setname`
+ for l in $list; do
+ echo $l
+ if $verbose; then
+ echo >&2 "DEBUG: list_set_files: $l"
+ fi
+ done
+ done | xargs ${SED} ${SUBST}
+}
+
# arch_to_cpu mach
#
# Print the ${MACHINE_CPU} for ${MACHINE_ARCH}=mach,
