From 4795965caf371a55285678e5860ae66e926ebd95 Mon Sep 17 00:00:00 2001 From: Judd Vinet Date: Sat, 25 Sep 2004 18:03:03 +0000 Subject: Imported from pacman-2.9.2.tar.gz --- ChangeLog | 1 + Makefile.in | 2 +- scripts/gensync | 2 +- scripts/makepkg | 2 +- scripts/makeworld | 2 +- scripts/updatesync | 2 +- src/db.c | 1 + src/pacman.h | 2 +- 8 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 57990b58..bbf9158a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +2.9.2 - bugfix for 2.9.1 2.9.1 - --refresh now only downloads fresh packages lists if they've been updated (currently only works with FTP) 2.9 - Improved -Rs functionality -- pacman now tracks why a package diff --git a/Makefile.in b/Makefile.in index b76705a8..d79c1fb7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -34,7 +34,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -PACVER = 2.9.1 +PACVER = 2.9.2 TOPDIR = @srcdir@ SRCDIR = $(TOPDIR)/src/ diff --git a/scripts/gensync b/scripts/gensync index f94a9bcb..ed6a0680 100755 --- a/scripts/gensync +++ b/scripts/gensync @@ -20,7 +20,7 @@ # USA. # -myver='2.9.1' +myver='2.9.2' usage() { echo "gensync $myver" diff --git a/scripts/makepkg b/scripts/makepkg index c0d217ff..efc750d2 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -20,7 +20,7 @@ # USA. # -myver='2.9.1' +myver='2.9.2' startdir=`pwd` PKGDEST=$startdir USE_COLOR="n" diff --git a/scripts/makeworld b/scripts/makeworld index 3606a86b..c42013c7 100755 --- a/scripts/makeworld +++ b/scripts/makeworld @@ -21,7 +21,7 @@ # toplevel=`pwd` -version="2.9.1" +version="2.9.2" usage() { echo "makeworld version $version" diff --git a/scripts/updatesync b/scripts/updatesync index 6b851db5..943af8a5 100755 --- a/scripts/updatesync +++ b/scripts/updatesync @@ -21,7 +21,7 @@ # USA. # -myver='2.9.1' +myver='2.9.2' usage() { echo "updatesync $myver" diff --git a/src/db.c b/src/db.c index bc332466..4d856479 100644 --- a/src/db.c +++ b/src/db.c @@ -148,6 +148,7 @@ pkginfo_t* db_scan(pacdb_t *db, char *target, unsigned int inforeq) /* stat the entry, make sure it's a directory */ snprintf(path, PATH_MAX, "%s/%s", db->path, name); if(stat(path, &sbuf) || !S_ISDIR(sbuf.st_mode)) { + ent = readdir(db->dir); continue; } /* truncate the string at the second-to-last hyphen, */ diff --git a/src/pacman.h b/src/pacman.h index f6a76c7b..d0b5a5a1 100644 --- a/src/pacman.h +++ b/src/pacman.h @@ -22,7 +22,7 @@ #define _PAC_PACMAN_H #ifndef PACVER -#define PACVER "2.9.1" +#define PACVER "2.9.2" #endif #ifndef PKGDIR -- cgit v1.2.3-24-g4f1b