Here's the diff I accumulated looking through the log.. -- see shy jo
Index: packages/localechooser/localechooser
===================================================================
--- packages/localechooser/localechooser (revision 37232)
+++ packages/localechooser/localechooser (working copy)
@@ -496,9 +496,7 @@
done
db_subst $localecode LOCALELIST "$CHOICES"
db_input medium $localecode || [ $? -eq 30 ]
- if db_go ; then
- log "Locale set successfully"
- else
+ if ! db_go; then
exit 10
fi
db_get $localecode
@@ -521,9 +519,7 @@
db_set $supportedlocales "$LOCALE"
fi
db_input medium $supportedlocales || [ $? -eq 30 ]
- if db_go; then
- log "Supported locales successfully set"
- else
+ if ! db_go; then
exit 10
fi
fi
Index: packages/localechooser/debian/changelog
===================================================================
--- packages/localechooser/debian/changelog (revision 37232)
+++ packages/localechooser/debian/changelog (working copy)
@@ -1,9 +1,14 @@
localechooser (1.15) UNRELEASED; urgency=low
+ [ Christian Perrier ]
* Add Valencian-Catalan to the languagelist (commented). Closes: #362502
- -- Christian Perrier <bubulle@kheops.frmug.org> Tue, 9 May 2006 12:09:01 +0200
+ [ Joey Hess ]
+ * Remove some unnecessary logging of success.
+ * Discard locale-gen stdout.
+ -- Joey Hess <joeyh@debian.org> Fri, 12 May 2006 17:04:05 -0500
+
localechooser (1.14) unstable; urgency=low
[ Christian Perrier ]
Index: packages/localechooser/post-base-installer
===================================================================
--- packages/localechooser/post-base-installer (revision 37232)
+++ packages/localechooser/post-base-installer (working copy)
@@ -87,8 +87,8 @@
fi
done
if [ "$gen" ]; then
- log-output -t localechooser \
- chroot /target /usr/sbin/locale-gen --keep-existing
+ log-output -t localechooser --pass-stdout \
+ chroot /target /usr/sbin/locale-gen --keep-existing >/dev/null
fi
exit 0
Index: packages/hw-detect/debian/changelog
===================================================================
--- packages/hw-detect/debian/changelog (revision 37232)
+++ packages/hw-detect/debian/changelog (working copy)
@@ -18,8 +18,11 @@
* Fix sysfs-update-devnames not to try to use 'local' outside a function,
which bash doesn't like.
- -- Christian Perrier <bubulle@debian.org> Sun, 7 May 2006 14:03:02 +0200
+ [ Joey Hess ]
+ * Removed some unnecessary and/or redundant debugging lines.
+ -- Joey Hess <joeyh@debian.org> Fri, 12 May 2006 15:23:32 -0500
+
hw-detect (1.35) unstable; urgency=low
* hwdetect.sh: look in /proc/modules instead of using lsmod.
Index: packages/hw-detect/hw-detect.sh
===================================================================
--- packages/hw-detect/hw-detect.sh (revision 37232)
+++ packages/hw-detect/hw-detect.sh (working copy)
@@ -43,7 +43,6 @@
# Module as first parameter, description of device the second.
missing_module () {
- log "Missing module '$module'."
if ! in_list "$1" "$MISSING_MODULES_LIST"; then
if [ -n "$MISSING_MODULES_LIST" ]; then
MISSING_MODULES_LIST="$MISSING_MODULES_LIST, "
@@ -145,7 +144,6 @@
DISCOVER_VERSION=1
fi
else
- log "No discover available. Maybe using hotplug instead?"
DISCOVER_VERSION=
fi
}
@@ -338,7 +336,6 @@
fi
fi
-log "Detecting hardware..."
db_progress INFO hw-detect/detect_progress_step
# Load yenta_socket on 2.6 kernels, if hardware is available, so that
@@ -431,7 +428,6 @@
MODULE_STEPSIZE=$(expr $MODULE_STEPS / $(list_to_lines | wc -l))
fi
-log "Loading modules..."
IFS="$NEWLINE"
for device in $(list_to_lines); do
@@ -449,7 +445,6 @@
db_subst hw-detect/load_progress_step CARDNAME "$cardname"
db_subst hw-detect/load_progress_step MODULE "$module"
db_progress INFO hw-detect/load_progress_step
- log "Trying to load module '$module'"
if [ "$cardname" = "[Unknown]" ]; then
load_module "$module"
else
@@ -752,38 +747,27 @@
# video hardware is in use.
case "$DISCOVER_VERSION" in
2)
- log "Detected discover version 2, installing discover."
apt-install discover || true
;;
1|'')
- # This will break woody install, as discover1 is
- # missing in woody. We should try to find out which
- # packages are available when selecting it for
- # installation. [pere 2004-04-23]
-
- log "Detected discover version 1, installing discover1."
apt-install discover1 || true
;;
esac
# Install udev/hotplug as well, as appropriate.
if type udevd >/dev/null 2>&1; then
- log "Detected udev support, installing udev."
apt-install udev || true
elif [ -f /proc/sys/kernel/hotplug ]; then
- log "Detected hotplug support (and no udev), installing hotplug."
apt-install hotplug || true
fi
# TODO: should this really be conditional on hotplug support?
if [ -f /proc/sys/kernel/hotplug ]; then
- log "Detected hotplug support, installing usbutils."
apt-install usbutils || true
fi
# Install acpi (works only for 2.6 kernels)
if [ -d /proc/acpi ]; then
- log "Detected acpi support, installing acpi/acpid."
apt-install acpi || true
apt-install acpid || true
fi
Index: packages/main-menu/debian/changelog
===================================================================
--- packages/main-menu/debian/changelog (revision 37232)
+++ packages/main-menu/debian/changelog (working copy)
@@ -1,3 +1,10 @@
+main-menu (1.13) UNRELEASED; urgency=low
+
+ * Comment out some debug items, switch another log item to info.
+ * Don't log about priority changing the first time through.
+
+ -- Joey Hess <joeyh@debian.org> Fri, 12 May 2006 13:56:30 -0500
+
main-menu (1.12) unstable; urgency=low
* Rebuilt with libd-i 0.41, 0.40 was broken.
Index: packages/main-menu/main-menu.c
===================================================================
--- packages/main-menu/main-menu.c (revision 37232)
+++ packages/main-menu/main-menu.c (working copy)
@@ -408,7 +408,7 @@
}
static int do_menu_item(di_system_package *p) {
- di_log(DI_LOG_LEVEL_DEBUG, "Menu item '%s' selected", p->p.package);
+ di_log(DI_LOG_LEVEL_INFO, "Menu item '%s' selected", p->p.package);
return di_config_package(p, satisfy_virtual);
}
@@ -463,9 +463,10 @@
if (pri > default_priority)
pri = default_priority;
if (local_priority != pri) {
- di_log(DI_LOG_LEVEL_INFO, "Modifying debconf priority limit from '%s' to '%s'",
- debconf->value ? debconf->value : "(null)",
- debconf_priorities[pri] ? debconf_priorities[pri] : "(null)");
+ if (local_priority > -1)
+ di_log(DI_LOG_LEVEL_INFO, "Modifying debconf priority limit from '%s' to '%s'",
+ debconf->value ? debconf->value : "(null)",
+ debconf_priorities[pri] ? debconf_priorities[pri] : "(null)");
local_priority = pri;
debconf_set(debconf, template, debconf_priorities[pri]);
@@ -488,9 +489,10 @@
}
}
- if ( pri != local_priority ) {
- di_log(DI_LOG_LEVEL_INFO, "Priority changed externally, setting main-menu default to '%s' (%s)",
- debconf_priorities[pri] ? debconf_priorities[pri] : "(null)", debconf->value);
+ if ( pri != local_priority) {
+ if (local_priority > -1)
+ di_log(DI_LOG_LEVEL_INFO, "Priority changed externally, setting main-menu default to '%s' (%s)",
+ debconf_priorities[pri] ? debconf_priorities[pri] : "(null)", debconf->value);
local_priority = pri;
default_priority = pri;
}
@@ -551,7 +553,7 @@
continue;
}
- di_log(DI_LOG_LEVEL_DEBUG, "Executing %s", filename);
+ //di_log(DI_LOG_LEVEL_DEBUG, "Executing %s", filename);
ret = system(filename);
if (ret != 0)
di_log(DI_LOG_LEVEL_WARNING, "%s exited with status %d", filename, ret);
@@ -624,10 +626,10 @@
di_slist_node *node;
di_system_package *dep;
- di_log(DI_LOG_LEVEL_DEBUG, "configure %s, status: %d\n", p->p.package, p->p.status);
+ //di_log(DI_LOG_LEVEL_DEBUG, "configure %s, status: %d\n", p->p.package, p->p.status);
if (p->p.type == di_package_type_virtual_package) {
- di_log(DI_LOG_LEVEL_DEBUG, "virtual package %s\n", p->p.package);
+ //di_log(DI_LOG_LEVEL_DEBUG, "virtual package %s\n", p->p.package);
if (virtfunc)
return virtfunc(p);
else
Index: packages/libdebian-installer/debian/changelog
===================================================================
--- packages/libdebian-installer/debian/changelog (revision 37232)
+++ packages/libdebian-installer/debian/changelog (working copy)
@@ -12,8 +12,11 @@
[ Colin Watson ]
* Fix Hurd detection at build time.
- -- Bastian Blank <waldi@debian.org> Tue, 18 Apr 2006 19:51:57 +0200
+ [ Joey Hess ]
+ * Move more resolver debug logging into ENABLE_EXTENSIVE_DEBUG ifdefs.
+ -- Joey Hess <joeyh@debian.org> Fri, 12 May 2006 17:16:44 -0500
+
libdebian-installer (0.41) unstable; urgency=low
* --add-udeb only works for one udeb, correct dh_makeshlibs call
Index: packages/libdebian-installer/src/packages.c
===================================================================
--- packages/libdebian-installer/src/packages.c (revision 37232)
+++ packages/libdebian-installer/src/packages.c (working copy)
@@ -200,21 +200,25 @@
goto error;
}
+#ifdef ENABLE_EXTENSIVE_DEBUG
if (dependend_package)
di_log (DI_LOG_LEVEL_DEBUG, "resolver (%s): mark, dependency from %s", package->package, dependend_package->package);
else
di_log (DI_LOG_LEVEL_DEBUG, "resolver (%s): mark", package->package);
-
+#endif
+
r->do_real (package, r->do_real_data);
break;
case di_package_type_virtual_package:
+#ifdef ENABLE_EXTENSIVE_DEBUG
if (dependend_package)
di_log (DI_LOG_LEVEL_DEBUG, "resolver (%s): search, dependency from %s", package->package, dependend_package->package);
else
di_log (DI_LOG_LEVEL_DEBUG, "resolver (%s): search", package->package);
-
+#endif
+
for (node = package->depends.head; node; node = node->next)
{
di_package_dependency *d = node->data;
Index: packages/kbd-chooser/kbd-chooser.c
===================================================================
--- packages/kbd-chooser/kbd-chooser.c (revision 37232)
+++ packages/kbd-chooser/kbd-chooser.c (working copy)
@@ -548,7 +548,6 @@
present = SERIAL_ABSENT;
debconf_set (client, "debian-installer/uml-console", present ? "true" : "false");
- di_info ("Setting debian-installer/uml-console to %s", present ? "true" : "false");
return present;
}
@@ -584,7 +583,6 @@
}
debconf_set (client, "debian-installer/serial-console", present ? "true" : "false");
- di_info ("Setting debian-installer/serial-console to %s", present ? "true" : "false");
return present;
}
@@ -740,7 +738,6 @@
void
keymap_set (struct debconfclient *client, char *keymap)
{
- di_info ("kbd_chooser: setting keymap %s", keymap);
debconf_set (client, "debian-installer/keymap", keymap);
// "seen" Used by scripts to decide not to call us again
// NOTE: not a typo, using 'true' makes things fail. amck!!!
@@ -789,7 +786,6 @@
state = QUIT;
break;
}
- di_info ("kbd-chooser: arch %s selected", arch);
if ((strcmp (arch, "no-keyboard") == 0) ||
(strcmp (arch, "skip-config") == 0)) {
di_info ("kbd-chooser: not setting keymap");
@@ -804,7 +800,6 @@
if (keymap_select (arch, keymap) == CMD_GOBACK) {
state = CHOOSE_ARCH;
} else {
- di_info ("choose_keymap: keymap = %s", keymap);
keymap_set (client, keymap);
state = QUIT;
}
Index: packages/kbd-chooser/debian/changelog
===================================================================
--- packages/kbd-chooser/debian/changelog (revision 37232)
+++ packages/kbd-chooser/debian/changelog (working copy)
@@ -1,10 +1,14 @@
kbd-chooser (1.26) UNRELEASED; urgency=low
+ [ Colin Watson ]
* Escape commas while substituting descriptions into choices lists
(closes: https://launchpad.net/bugs/40042).
- -- Colin Watson <cjwatson@debian.org> Wed, 10 May 2006 21:49:43 +0100
+ [ Joey Hess ]
+ * Comment out or remove some debug items.
+ -- Joey Hess <joeyh@debian.org> Fri, 12 May 2006 14:03:46 -0500
+
kbd-chooser (1.25) unstable; urgency=low
* No longer offer mac-usb keymaps; force any usb keyboard to use AT
Index: packages/kbd-chooser/usb-kbd.c
===================================================================
--- packages/kbd-chooser/usb-kbd.c (revision 37232)
+++ packages/kbd-chooser/usb-kbd.c (working copy)
@@ -141,7 +141,7 @@
fp = fopen("/proc/bus/usb/devices", "r");
}
if (fp) {
- di_debug ("Parsing /proc/bus/usb/devices\n");
+ //di_debug ("Parsing /proc/bus/usb/devices\n");
while (!feof(fp)) {
fgets(buf, LINESIZE, fp);
if ((p = strstr (buf, "Vendor=")) != NULL) {
Index: packages/base-installer/debian/postinst
===================================================================
--- packages/base-installer/debian/postinst (revision 37232)
+++ packages/base-installer/debian/postinst (working copy)
@@ -195,7 +195,6 @@
partsdir="/usr/lib/base-installer.d"
if [ -d "$partsdir" ]; then
tmpfile=/tmp/base-installer-hook.log
- info "Execution hook before debootstrap"
for script in `ls "$partsdir"/*`; do
base=$(basename $script | sed 's/[0-9]*//')
if ! db_progress INFO base-installer/progress/$base; then
@@ -204,7 +203,6 @@
fi
if [ -x "$script" ] ; then
- info "Running $script"
# be careful to preserve exit code
if "$script" >"$tmpfile" 2>&1; then
:
@@ -483,7 +481,6 @@
available_initramfs_generators () {
irf_list=""
db_get base-installer/kernel/linux/initramfs-generators || return 1
- info "Possible initramfs generator(s): '$RET'"
for irf in $RET; do
if LANG=C chroot /target apt-cache policy $irf 2>&1 | \
@@ -648,7 +645,6 @@
package=initrd-tools
ramdiskconf=/target/etc/mkinitrd/mkinitrd.conf
fi
- echo "Selected initrd generator '$package'."
# Sarge does not have any initramfs generators, though custom images may
if [ -z "$package" ] ; then
@@ -666,8 +662,6 @@
# TODO This should probably be restructured to better support
# differences between initrd generators
if [ yes = "$do_initrd" ] ; then
- info "Installing $package."
-
# Make sure the ramdisk creation tool is installed before we
# change its configuration
db_subst base-installer/section/install_kernel_package SUBST0 "$package"
@@ -741,7 +735,6 @@
update_progress 30 100
# Install the kernel
- info "Installing kernel '$KERNEL'."
db_subst base-installer/section/install_kernel_package SUBST0 "$KERNEL"
db_progress INFO base-installer/section/install_kernel_package
log-output -t base-installer apt-install "$KERNEL" || kernel_install_failed=$?
@@ -788,7 +781,7 @@
}
install_extra () {
- info "Installing extra packages into /target/."
+ info "Installing queued packages into /target/."
if [ -f /var/lib/apt-install/queue ] ; then
# We need to install these one by one in case one fails.
@@ -798,9 +791,7 @@
db_subst base-installer/section/install_extra_package SUBST0 "$PKG"
db_progress INFO base-installer/section/install_extra_package
- if log-output -t base-installer apt-install $PKG; then
- info "Installed $PKG successfully into /target/"
- else
+ if ! log-output -t base-installer apt-install $PKG; then
warning "Failed to install $PKG into /target/: $?"
fi
@@ -815,7 +806,6 @@
partsdir="/usr/lib/post-base-installer.d"
if [ -d "$partsdir" ]; then
tmpfile=/tmp/post-base-installer-hook.log
- info "Running post-base-installation hooks"
scriptcount=`ls "$partsdir"/* | wc -l`
scriptcur=0
for script in "$partsdir"/*; do
@@ -827,7 +817,6 @@
fi
if [ -x "$script" ]; then
- info "Running $script"
# be careful to preserve exit code
if "$script" >"$tmpfile" 2>&1; then
:
@@ -849,7 +838,6 @@
}
cleanup () {
- info "Cleaning up"
rm -f $KERNEL_LIST
}
Index: packages/base-installer/debian/changelog
===================================================================
--- packages/base-installer/debian/changelog (revision 37232)
+++ packages/base-installer/debian/changelog (working copy)
@@ -15,8 +15,11 @@
[ Christian Perrier ]
* Split _Choices to __Choices in templates
- -- Christian Perrier <bubulle@debian.org> Fri, 5 May 2006 22:34:24 +0200
+ [ Joey Hess ]
+ * Remove some unnecessary debug logging.
+ -- Joey Hess <joeyh@debian.org> Fri, 12 May 2006 16:59:42 -0500
+
base-installer (1.56) unstable; urgency=low
[ Frans Pop ]
Index: packages/os-prober/debian/changelog
===================================================================
--- packages/os-prober/debian/changelog (revision 37232)
+++ packages/os-prober/debian/changelog (working copy)
@@ -1,3 +1,9 @@
+os-prober (1.11) UNRELEASED; urgency=low
+
+ * Remove a useless debug message.
+
+ -- Joey Hess <joeyh@debian.org> Fri, 12 May 2006 16:49:49 -0500
+
os-prober (1.10) unstable; urgency=low
[ Colin Watson ]
Index: packages/os-prober/os-prober
===================================================================
--- packages/os-prober/os-prober (revision 37232)
+++ packages/os-prober/os-prober (working copy)
@@ -44,7 +44,6 @@
for prog in /usr/lib/os-probes/init/*; do
if [ -x $prog ] && [ -f $prog ]; then
- debug "running init $prog"
$prog || true
fi
done
Index: packages/cdrom-retriever/debian/changelog
===================================================================
--- packages/cdrom-retriever/debian/changelog (revision 37232)
+++ packages/cdrom-retriever/debian/changelog (working copy)
@@ -1,3 +1,9 @@
+cdrom-retriever (1.10) UNRELEASED; urgency=low
+
+ * Remove some unncessary logging.
+
+ -- Joey Hess <joeyh@debian.org> Fri, 12 May 2006 15:26:51 -0500
+
cdrom-retriever (1.09) unstable; urgency=low
[ Joey Hess ]
Index: packages/cdrom-retriever/cdrom-retriever
===================================================================
--- packages/cdrom-retriever/cdrom-retriever (revision 37232)
+++ packages/cdrom-retriever/cdrom-retriever (working copy)
@@ -11,9 +11,6 @@
warning() {
log "warning: $@"
}
-info() {
- log "info: $@"
-}
CDMNT=/cdrom
ARCH=`udpkg --print-architecture`
@@ -23,7 +20,6 @@
case "x$cmd" in
xconfig)
- info "Retrieving udeb include and exclude file."
for f in include exclude; do
if [ -e "$CDMNT/.disk/udeb_$f.$ARCH" ]; then
ln -sf "$CDMNT/.disk/udeb_$f.$ARCH" "/var/cache/anna/$f"
@@ -44,7 +40,6 @@
;;
xpackages)
- info "Retrieving package list."
rm -f "$1"
touch "$1"
if db_get cdrom/codename && [ "$RET" ]; then
Index: packages/user-setup/functions.sh
===================================================================
--- packages/user-setup/functions.sh (revision 37232)
+++ packages/user-setup/functions.sh (working copy)
@@ -3,7 +3,7 @@
if ! [ -e $ROOT/etc/passwd ]; then
return 1
fi
-
+
# Assume NIS, or any uid from 1000 to 29999, means there is a user.
if grep -q '^+:' $ROOT/etc/passwd || \
grep -q '^[^:]*:[^:]*:[1-9][0-9][0-9][0-9]:' $ROOT/etc/passwd || \
@@ -16,6 +16,10 @@
# Returns a true value if root already has a password.
root_password () {
+ if ! [ -e $ROOT/etc/passwd ]; then
+ return 1
+ fi
+
# Assume there is a root password if NIS is being used.
if grep -q '^+:' $ROOT/etc/passwd; then
return 0
Index: packages/user-setup/debian/changelog
===================================================================
--- packages/user-setup/debian/changelog (revision 37232)
+++ packages/user-setup/debian/changelog (working copy)
@@ -1,9 +1,14 @@
user-setup (1.2) UNRELEASED; urgency=low
+ [ Christian Perrier ]
* Space-indentation cleanup in user-setup-ask.
- -- Christian Perrier <bubulle@debian.org> Sun, 23 Apr 2006 09:29:24 +0200
+ [ Joey Hess ]
+ * Comment out STATE debugging message.
+ * Check for the passwd file before grepping it.
+ -- Joey Hess <joeyh@debian.org> Fri, 12 May 2006 16:55:03 -0500
+
user-setup (1.1) unstable; urgency=low
[ Tollef Fog Heen ]
Index: packages/user-setup/user-setup-ask
===================================================================
--- packages/user-setup/user-setup-ask (revision 37232)
+++ packages/user-setup/user-setup-ask (working copy)
@@ -189,7 +189,7 @@
else
STATE=$(($STATE - 1))
fi
- echo "ON STATE: $STATE"
+ #echo "ON STATE: $STATE"
done
if test "$STATE" = -1
Index: packages/anna/debian/changelog
===================================================================
--- packages/anna/debian/changelog (revision 37232)
+++ packages/anna/debian/changelog (working copy)
@@ -5,8 +5,11 @@
as "want_unknown", except for components that will be included in the menu
and their dependencies. Closes: #274307.
- -- Frans Pop <fjp@debian.org> Mon, 17 Apr 2006 23:29:04 +0200
+ [ Joey Hess ]
+ * Comment out unnecessary log line.
+ -- Joey Hess <joeyh@debian.org> Fri, 12 May 2006 15:39:49 -0500
+
anna (1.23) unstable; urgency=low
* Rebuilt with libd-i 0.41, 0.40 was broken.
Index: packages/anna/anna.c
===================================================================
--- packages/anna/anna.c (revision 37232)
+++ packages/anna/anna.c (working copy)
@@ -425,7 +425,7 @@
}
if (installed) {
- di_log (DI_LOG_LEVEL_DEBUG, "skipping already installed %s", argv[i]);
+ //di_log (DI_LOG_LEVEL_DEBUG, "skipping already installed %s", argv[i]);
continue;
}
Attachment:
signature.asc
Description: Digital signature