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

added more pm_errnos

Browse source
This commit is contained in:
Aurelien Foret 2005-11-07 09:43:25 +00:00
parent 096e531236
commit 6a2230dce1
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/libalpm/package.c
View file

@ -267,6 +267,11 @@ pmpkg_t *pkg_load(char *pkgfile)
RET_ERR(PM_ERR_MEMORY, NULL); RET_ERR(PM_ERR_MEMORY, NULL);
} }
/* ORE
* We should get the name and version information from the file name
* by using pkg_splitname()
*/
for(i = 0; !th_read(tar); i++) { for(i = 0; !th_read(tar); i++) {
if(config && filelist && scriptcheck) { if(config && filelist && scriptcheck) {
/* we have everything we need */ /* we have everything we need */
@ -281,16 +286,20 @@ pmpkg_t *pkg_load(char *pkgfile)
tar_extract_file(tar, descfile); tar_extract_file(tar, descfile);
/* parse the info file */ /* parse the info file */
if(parse_descfile(descfile, info, 0) == -1) { if(parse_descfile(descfile, info, 0) == -1) {
_alpm_log(PM_LOG_ERROR, "could not parse the package description file");
pm_errno = PM_ERR_PKG_INVALID;
FREE(descfile); FREE(descfile);
goto error; goto error;
} }
if(!strlen(info->name)) { if(!strlen(info->name)) {
_alpm_log(PM_LOG_ERROR, "missing package name in %s", pkgfile); _alpm_log(PM_LOG_ERROR, "missing package name in %s", pkgfile);
pm_errno = PM_ERR_PKG_INVALID;
FREE(descfile); FREE(descfile);
goto error; goto error;
} }
if(!strlen(info->version)) { if(!strlen(info->version)) {
_alpm_log(PM_LOG_ERROR, "missing package version in %s", pkgfile); _alpm_log(PM_LOG_ERROR, "missing package version in %s", pkgfile);
pm_errno = PM_ERR_PKG_INVALID;
FREE(descfile); FREE(descfile);
goto error; goto error;
} }