diff options
| author | Dan McGee <dan@archlinux.org> | 2012-01-23 12:19:51 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-01-23 12:20:52 -0600 |
| commit | e50c4a8837cedf47c2fe1a2c6064b4dc03dc5b03 (patch) | |
| tree | df2e33d95d02b17e5d720320c19e267893d68bdf /src/pacman/pacman.c | |
| parent | b3612e9cc198f198b3806efa461bf6fc04dd4502 (diff) | |
| parent | 825b4ff35aa676b139dc24bc651724b092f2fded (diff) | |
| download | pacman-e50c4a8837cedf47c2fe1a2c6064b4dc03dc5b03.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/diskspace.c
src/pacman/util.h
Diffstat (limited to 'src/pacman/pacman.c')
| -rw-r--r-- | src/pacman/pacman.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 3e17d905..014520e8 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -218,7 +218,7 @@ static void version(void) { printf("\n"); printf(" .--. Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version()); - printf("/ _.-' .-. .-. .-. Copyright (C) 2006-2011 Pacman Development Team\n"); + printf("/ _.-' .-. .-. .-. Copyright (C) 2006-2012 Pacman Development Team\n"); printf("\\ '-. '-' '-' '-' Copyright (C) 2002-2006 Judd Vinet\n"); printf(" '--'\n"); printf(_(" This program may be freely redistributed under\n" @@ -791,7 +791,7 @@ int main(int argc, char *argv[]) config = config_new(); /* disable progressbar if the output is redirected */ - if(!isatty(1)) { + if(!isatty(fileno(stdout))) { config->noprogressbar = 1; } |