diff options
| author | Andrew Fyfe <andrew@neptune-one.net> | 2007-07-12 21:12:08 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-07-12 21:22:16 +0200 |
| commit | fd3a1a92c8ffe5230e40a027838442752a843da9 (patch) | |
| tree | 99f1314a400a3ea8d6cd4c112ca0f6cf3746d94e | |
| parent | 20f73d6299c08fa79c2c8edd3d1955e208e701cb (diff) | |
| download | pacman-fd3a1a92c8ffe5230e40a027838442752a843da9.tar.gz pacman-fd3a1a92c8ffe5230e40a027838442752a843da9.tar.xz | |
Fix previous makepkg patch, and some pacman output.
makepkg: We still need the source files in $srcdir because PKGBUILDS need
access to noextract() files and other file not handled by by
extract_source(). (eg config files)
query.c: Fix some output formating.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
| -rw-r--r-- | scripts/makepkg.sh.in | 2 | ||||
| -rw-r--r-- | src/pacman/query.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 137d58e5..d340252e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -447,9 +447,11 @@ download_sources() { local file=$(strip_url "$netfile") if [ -f "$startdir/$file" ]; then msg2 "$(gettext "Found %s in build dir")" "$file" + cp -s --remove-destination "$startdir/$file" "$srcdir/" continue elif [ -f "$SRCDEST/$file" ]; then msg2 "$(gettext "Using cached copy of %s")" "$file" + cp -s --remove-destination "$SRCDEST/$file" "$srcdir/" continue fi diff --git a/src/pacman/query.c b/src/pacman/query.c index cfd53df7..f6c6b5d0 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -251,7 +251,7 @@ static int query_test(void) int ret = 0; alpm_list_t *testlist; - printf(_("Checking database for consistency...")); + printf(_("Checking database for consistency... ")); testlist = alpm_db_test(db_local); if(testlist == NULL) { printf(_("check complete.\n")); @@ -271,7 +271,7 @@ static int query_test(void) static int query_upgrades(void) { - printf(_("Checking for package upgrades...")); + printf(_("Checking for package upgrades... \n")); alpm_list_t *syncpkgs; if((syncpkgs = alpm_db_get_upgrades()) != NULL) { @@ -279,7 +279,7 @@ static int query_upgrades(void) return(0); } - printf(_("no upgrades found")); + printf(_("no upgrades found.\n")); return(1); } |