[Frugalware-git] pacman-g2: _pacman_db_rewind: handle if the db is closed

[Miklos Vajna]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4de1fecd3c7c49725b522f9a1134450b73069f62

commit 4de1fecd3c7c49725b522f9a1134450b73069f62
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Sun Jul 3 13:10:49 2011 +0200

_pacman_db_rewind: handle if the db is closed

diff --git a/lib/libpacman/be_files.c b/lib/libpacman/be_files.c
index 67a38b7..cef2bc3 100644
--- a/lib/libpacman/be_files.c
+++ b/lib/libpacman/be_files.c
@@ -145,7 +145,7 @@ void _pacman_db_close(pmdb_t *db)

void _pacman_db_rewind(pmdb_t *db)
{
-       if(db == NULL || db->handle == NULL) {
+       if(db == NULL || (islocal(db) && db->handle == NULL)) {
return;
}

@@ -154,7 +154,8 @@ void _pacman_db_rewind(pmdb_t *db)
} else {
char dbpath[PATH_MAX];
snprintf(dbpath, PATH_MAX, "%s" PM_EXT_DB, db->path);
-               archive_read_finish(db->handle);
+               if (db->handle)
+                       archive_read_finish(db->handle);
db->handle = archive_read_new();
archive_read_support_compression_all(db->handle);
archive_read_support_format_all(db->handle);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git