moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00
Code Issues Releases Wiki Activity

* makepkg.conf.in variable changes (missed the checkin)

Browse Source 
* Better error reporting when unpacking an archive fails
* Fixed -Sc and -Scc cache dir opening/reading
This commit is contained in:
Aaron Griffin 2006-11-16 17:24:41 +00:00
parent 95358f7c5b
commit 3d6242ed74
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etc/makepkg.conf.in
View File

@ -48,6 +48,8 @@ USE_COLOR="y"
NOSTRIP=0 NOSTRIP=0
#-- Keep doc and info directories #-- Keep doc and info directories
KEEPDOCS=0 KEEPDOCS=0
#-- Use ccache when building
USE_CCACHE=0
######################################################################### #########################################################################
# PACKAGE OUTPUT # PACKAGE OUTPUT
@ -63,9 +65,14 @@ KEEPDOCS=0
# Most of this will probably not need to be changed by and end user # Most of this will probably not need to be changed by and end user
######################################################################### #########################################################################
# #
#-- Name of the script which makepkg reads
BUILDSCRIPT="PKGBUILD" BUILDSCRIPT="PKGBUILD"
#-- Extension of the resultant package
PKGEXT="pkg.tar.gz" PKGEXT="pkg.tar.gz"
INTEGRITY_CHECK="sha1" #-- File integrity checks to use. Valid:
# md5, sha1, sha256, sha384, sha512
INTEGRITY_CHECK=(md5 sha1)
#-- The root to use when building from source
source "/etc/abs/abs.conf" source "/etc/abs/abs.conf"
SRCROOT=$ABSROOT SRCROOT=$ABSROOT

2
lib/libalpm/error.c
View File

@ -33,7 +33,7 @@ char *alpm_strerror(int err)
case PM_ERR_MEMORY: case PM_ERR_MEMORY:
return _("out of memory!"); return _("out of memory!");
case PM_ERR_SYSTEM: case PM_ERR_SYSTEM:
return _("unexpected error"); return _("unexpected system error");
case PM_ERR_BADPERMS: case PM_ERR_BADPERMS:
return _("insufficient privileges"); return _("insufficient privileges");
case PM_ERR_WRONG_ARGS: case PM_ERR_WRONG_ARGS:

6
lib/libalpm/util.c
View File

@ -273,8 +273,10 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn)
archive_read_support_compression_all(_archive); archive_read_support_compression_all(_archive);
archive_read_support_format_all(_archive); archive_read_support_format_all(_archive);
if(archive_read_open_file(_archive, archive, ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) if(archive_read_open_file(_archive, archive, ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
_alpm_log(PM_LOG_ERROR, _("could not open %s: %s\n"), archive, archive_error_string(_archive));
RET_ERR(PM_ERR_PKG_OPEN, -1); RET_ERR(PM_ERR_PKG_OPEN, -1);
}
while(archive_read_next_header(_archive, &entry) == ARCHIVE_OK) { while(archive_read_next_header(_archive, &entry) == ARCHIVE_OK) {
if (fn && strcmp(fn, archive_entry_pathname(entry))) { if (fn && strcmp(fn, archive_entry_pathname(entry))) {
@ -285,7 +287,7 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn)
snprintf(expath, PATH_MAX, "%s/%s", prefix, archive_entry_pathname(entry)); snprintf(expath, PATH_MAX, "%s/%s", prefix, archive_entry_pathname(entry));
archive_entry_set_pathname(entry, expath); archive_entry_set_pathname(entry, expath);
if(archive_read_extract(_archive, entry, ARCHIVE_EXTRACT_FLAGS) != ARCHIVE_OK) { if(archive_read_extract(_archive, entry, ARCHIVE_EXTRACT_FLAGS) != ARCHIVE_OK) {
fprintf(stderr, _("could not extract %s: %s\n"), archive_entry_pathname(entry), archive_error_string(_archive)); _alpm_log(PM_LOG_ERROR, _("could not extract %s: %s\n"), archive_entry_pathname(entry), archive_error_string(_archive));
return(1); return(1);
} }

4
src/pacman/sync.c
View File

@ -59,9 +59,9 @@ static int sync_cleancache(int level)
char dirpath[PATH_MAX]; char dirpath[PATH_MAX];
alpm_get_option(PM_OPT_ROOT, &lroot); alpm_get_option(PM_OPT_ROOT, &lroot);
root = (void *)&lroot; root = (void *)lroot;
alpm_get_option(PM_OPT_CACHEDIR, &lcachedir); alpm_get_option(PM_OPT_CACHEDIR, &lcachedir);
cachedir = (void *)&lcachedir; cachedir = (void *)lcachedir;
snprintf(dirpath, PATH_MAX, "%s%s", root, cachedir); snprintf(dirpath, PATH_MAX, "%s%s", root, cachedir);