bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Imported from pacman-2.9.7-TEST2.tar.gz

Browse source
This commit is contained in:
Judd Vinet 2005-09-07 07:03:50 +00:00
parent 08962d40c0
commit 3ba0d67cb1
5 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -2,6 +2,7 @@ VERSION DESCRIPTION
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
2.9.7 - patch from Miklos Vanja fixed md5sums on x86_64 2.9.7 - patch from Miklos Vanja fixed md5sums on x86_64
- patch from Miklos Vanja adds --sudosync to makepkg - patch from Miklos Vanja adds --sudosync to makepkg
- patch from Jason Chu adds SHA1 hashes to PKGBUILDs
- changed license field to operate as an array, not a string - changed license field to operate as an array, not a string
- added more logic for file conflict checks - if one target - added more logic for file conflict checks - if one target
is a file and the other is a directory, then it's a conflict is a file and the other is a directory, then it's a conflict

4
etc/makepkg.conf
View file

@ -16,8 +16,8 @@ export CFLAGS="-march=i686 -O2 -pipe"
export CXXFLAGS="-march=i686 -O2 -pipe" export CXXFLAGS="-march=i686 -O2 -pipe"
# Pentium Pro/Pentium II/Pentium III+/Pentium 4/Athlon optimized (but binaries # Pentium Pro/Pentium II/Pentium III+/Pentium 4/Athlon optimized (but binaries
# will run on any x86 system) # will run on any x86 system)
#export CFLAGS="-mcpu=i686 -O2 -pipe" #export CFLAGS="-mtune=i686 -O2 -pipe"
#export CXXFLAGS="-mcpu=i686 -O2 -pipe" #export CXXFLAGS="-mtune=i686 -O2 -pipe"
# SMP Systems # SMP Systems
#export MAKEFLAGS="-j 2" #export MAKEFLAGS="-j 2"

1
scripts/makepkg
View file

@ -590,6 +590,7 @@ fi
cd $startdir cd $startdir
rm -rf pkg/usr/info pkg/usr/share/info rm -rf pkg/usr/info pkg/usr/share/info
rm -rf pkg/usr/doc pkg/usr/share/doc rm -rf pkg/usr/doc pkg/usr/share/doc
rm -rf pkg/{usr,opt/gnome}/share/gtk-doc
# move /usr/share/man files to /usr/man # move /usr/share/man files to /usr/man
if [ -d pkg/usr/share/man ]; then if [ -d pkg/usr/share/man ]; then

7
src/db.c
View file

@ -779,7 +779,11 @@ PMList* db_find_conflicts(pacdb_t *db, PMList *targets, char *root, PMList **ski
* is not (or vice versa) then it's a conflict * is not (or vice versa) then it's a conflict
*/ */
ok = 0; ok = 0;
} else if(S_ISDIR(buf.st_mode)) { goto donecheck;
}
/* re-fetch with stat() instead of lstat() */
stat(path, &buf);
if(S_ISDIR(buf.st_mode)) {
/* if it's a directory, then we have no conflict */ /* if it's a directory, then we have no conflict */
ok = 1; ok = 1;
} else { } else {
@ -845,6 +849,7 @@ PMList* db_find_conflicts(pacdb_t *db, PMList *targets, char *root, PMList **ski
} }
} }
} }
donecheck:
if(!ok) { if(!ok) {
MALLOC(str, 512); MALLOC(str, 512);
snprintf(str, 512, "%s: %s: exists in filesystem", p->name, path); snprintf(str, 512, "%s: %s: exists in filesystem", p->name, path);

2
src/pacman.c
View file

@ -693,7 +693,7 @@ int pacman_sync(pacdb_t *db, PMList *targets)
cmp = rpmvercmp(local->version, sync->pkg->version); cmp = rpmvercmp(local->version, sync->pkg->version);
if(cmp > 0 && !sync->pkg->force) { if(cmp > 0 && !sync->pkg->force) {
/* local version is newer */ /* local version is newer */
fprintf(stderr, ":: %s: local version (%s) is newer than repo version (%s)\n", fprintf(stderr, ":: %s: local version (%s) appears to be newer than repo version (%s)\n",
local->name, local->version, sync->pkg->version); local->name, local->version, sync->pkg->version);
newer = 1; newer = 1;
FREE(sync); FREE(sync);