Merge branch 'maint'

Conflicts:
	lib/libalpm/be_files.c
This commit is contained in:
Dan McGee 2011-01-12 09:23:24 -06:00
commit 5615b71688
1 changed files with 2 additions and 2 deletions

View File

@ -262,10 +262,10 @@ static void setarch(const char *arch)
if (strcmp(arch, "auto") == 0) {
struct utsname un;
uname(&un);
pm_printf(PM_LOG_DEBUG, "config: architecture: %s\n", un.machine);
pm_printf(PM_LOG_DEBUG, "config: Architecture: %s\n", un.machine);
alpm_option_set_arch(un.machine);
} else {
pm_printf(PM_LOG_DEBUG, "config: architecture: %s\n", arch);
pm_printf(PM_LOG_DEBUG, "config: Architecture: %s\n", arch);
alpm_option_set_arch(arch);
}
}