moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-09 04:57:59 -05:00
Code Issues Releases Wiki Activity

* Fix asking the user to upgrade when using -Sp

Browse Source 
* More significant error messages when -Qo fails
* Potential fix for reported error that pacman indicates corrupt packages
  when space is full on the cache dir
This commit is contained in:
Aaron Griffin 2007-03-21 03:08:19 +00:00
parent 8ded2051d2
commit 941c23025c
3 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/libalpm/server.c
View File

@ -29,6 +29,7 @@
#include <sys/stat.h>
#include <unistd.h>
#include <time.h>
#include <errno.h>
#include <download.h>
/* libalpm */
@ -290,6 +291,9 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath,
localf = fopen(output, "w");
if(localf == NULL) { /* still null? */
_alpm_log(PM_LOG_ERROR, _("cannot write to file '%s'"), output);
if(dlf != NULL) {
fclose(dlf);
}
return -1;
}
}
@ -300,8 +304,29 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath,
int nread = 0;
char buffer[PM_DLBUF_LEN];
while((nread = fread(buffer, 1, PM_DLBUF_LEN, dlf)) > 0) {
if(ferror(dlf)) {
_alpm_log(PM_LOG_ERROR, _("error downloading '%s': %s"),
fn, downloadLastErrString);
fclose(localf);
fclose(dlf);
return(-1);
}
int nwritten = 0;
while((nwritten += fwrite(buffer, 1, (nread - nwritten), localf)) < nread) ;
while(nwritten < nread) {
nwritten += fwrite(buffer, 1, (nread - nwritten), localf);
if(ferror(localf)) {
_alpm_log(PM_LOG_ERROR, _("error writing to file '%s': %s"),
realfile, strerror(errno));
fclose(localf);
fclose(dlf);
return(-1);
}
}
if(nwritten != nread) {
}
dltotal_bytes += nread;
if(handle->dlcb) handle->dlcb(pkgname, dltotal_bytes, ust.size);

2
lib/libalpm/sync.c
View File

@ -317,7 +317,7 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy
if(!resp) {
return(0);
}
} else {
} else if(!(trans->flags & PM_TRANS_FLAG_PRINTURIS)) {
QUESTION(trans, PM_TRANS_CONV_LOCAL_UPTODATE, local, NULL, NULL, &resp);
if(!resp) {
_alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping"),

15
src/pacman/query.c
View File

@ -27,6 +27,7 @@
#include <string.h>
#include <sys/stat.h>
#include <libintl.h>
#include <errno.h>
#include <alpm.h>
#include <alpm_list.h>
@ -57,8 +58,18 @@ static void query_fileowner(pmdb_t *db, char *filename)
return;
}
if(stat(filename, &buf) == -1 || S_ISDIR(buf.st_mode) || realpath(filename, rpath) == NULL) {
/* fail silently if we're a directory */
if(stat(filename, &buf) == -1) {
ERR(NL, _("failed to read file '%s': %s"), filename, strerror(errno));
return;
}
if(S_ISDIR(buf.st_mode)) {
ERR(NL, _("can not determine ownership of a directory"));
return;
}
if(realpath(filename, rpath) == NULL) {
ERR(NL, _("cannot determine real path for '%s': %s"), filename, strerror(errno));
return;
}