moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-10 13:28:12 -05:00
Code Issues Releases Wiki Activity

Fix previous makepkg patch, and some pacman output.

Browse Source 
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>
This commit is contained in:
Andrew Fyfe 2007-07-12 20:12:08 +01:00 committed by Dan McGee
parent 20f73d6299
commit fd3a1a92c8
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/makepkg.sh.in
View File

@ -447,9 +447,11 @@ download_sources() {
local file=$(strip_url "$netfile") local file=$(strip_url "$netfile")
if [ -f "$startdir/$file" ]; then if [ -f "$startdir/$file" ]; then
msg2 "$(gettext "Found %s in build dir")" "$file" msg2 "$(gettext "Found %s in build dir")" "$file"
cp -s --remove-destination "$startdir/$file" "$srcdir/"
continue continue
elif [ -f "$SRCDEST/$file" ]; then elif [ -f "$SRCDEST/$file" ]; then
msg2 "$(gettext "Using cached copy of %s")" "$file" msg2 "$(gettext "Using cached copy of %s")" "$file"
cp -s --remove-destination "$SRCDEST/$file" "$srcdir/"
continue continue
fi fi

6
src/pacman/query.c
View File

@ -251,7 +251,7 @@ static int query_test(void)
int ret = 0; int ret = 0;
alpm_list_t *testlist; alpm_list_t *testlist;
printf(_("Checking database for consistency...")); printf(_("Checking database for consistency... "));
testlist = alpm_db_test(db_local); testlist = alpm_db_test(db_local);
if(testlist == NULL) { if(testlist == NULL) {
printf(_("check complete.\n")); printf(_("check complete.\n"));
@ -271,7 +271,7 @@ static int query_test(void)
static int query_upgrades(void) static int query_upgrades(void)
{ {
printf(_("Checking for package upgrades...")); printf(_("Checking for package upgrades... \n"));
alpm_list_t *syncpkgs; alpm_list_t *syncpkgs;
if((syncpkgs = alpm_db_get_upgrades()) != NULL) { if((syncpkgs = alpm_db_get_upgrades()) != NULL) {
@ -279,7 +279,7 @@ static int query_upgrades(void)
return(0); return(0);
} }
printf(_("no upgrades found")); printf(_("no upgrades found.\n"));
return(1); return(1);
} }