emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a test in config file handling that made all conf_files not properly detected.

Browse Source
This commit is contained in:
Juan RP 2011-01-16 16:55:01 +01:00
parent 0fe503b7f4
commit 3c4b375ecf
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/package_config_files.c
View File

@ -41,19 +41,13 @@ entry_is_conf_file(prop_dictionary_t propsd, struct archive_entry *entry)
{ {
prop_object_t obj; prop_object_t obj;
prop_object_iterator_t iter; prop_object_iterator_t iter;
char *entrytmp, *cffile; char *cffile;
int rv = 0; int rv = 0;
iter = xbps_get_array_iter_from_dict(propsd, "conf_files"); iter = xbps_get_array_iter_from_dict(propsd, "conf_files");
if (iter == NULL) if (iter == NULL)
return -1; return -1;
entrytmp = xbps_xasprintf(".%s", archive_entry_pathname(entry));
if (entrytmp == NULL) {
rv = -1;
goto out;
}
while ((obj = prop_object_iterator_next(iter))) { while ((obj = prop_object_iterator_next(iter))) {
cffile = xbps_xasprintf(".%s", cffile = xbps_xasprintf(".%s",
prop_string_cstring_nocopy(obj)); prop_string_cstring_nocopy(obj));
@ -61,7 +55,7 @@ entry_is_conf_file(prop_dictionary_t propsd, struct archive_entry *entry)
rv = -1; rv = -1;
goto out; goto out;
} }
if (strcmp(cffile, entrytmp) == 0) { if (strcmp(cffile, archive_entry_pathname(entry)) == 0) {
rv = 1; rv = 1;
free(cffile); free(cffile);
break; break;
@ -71,9 +65,6 @@ entry_is_conf_file(prop_dictionary_t propsd, struct archive_entry *entry)
out: out:
prop_object_iterator_release(iter); prop_object_iterator_release(iter);
if (entrytmp)
free(entrytmp);
return rv; return rv;
} }
@ -109,8 +100,14 @@ xbps_config_file_from_archive_entry(prop_dictionary_t filesd,
* installed package. * installed package.
*/ */
prop_dictionary_get_cstring_nocopy(propsd, "pkgname", &pkgname); prop_dictionary_get_cstring_nocopy(propsd, "pkgname", &pkgname);
xbps_dbg_printf("%s: processing conf_file %s\n",
pkgname, archive_entry_pathname(entry));
forigd = xbps_get_pkg_dict_from_metadata_plist(pkgname, XBPS_PKGFILES); forigd = xbps_get_pkg_dict_from_metadata_plist(pkgname, XBPS_PKGFILES);
if (forigd == NULL) { if (forigd == NULL) {
xbps_dbg_printf("%s: conf_file %s not currently installed\n",
pkgname, archive_entry_pathname(entry));
install_new = true; install_new = true;
goto out; goto out;
} }
@ -143,6 +140,8 @@ xbps_config_file_from_archive_entry(prop_dictionary_t filesd,
*/ */
if (sha256_orig == NULL) { if (sha256_orig == NULL) {
install_new = true; install_new = true;
xbps_dbg_printf("%s: conf_file %s unknown orig sha256\n",
pkgname, archive_entry_pathname(entry));
goto out; goto out;
} }
@ -170,6 +169,9 @@ xbps_config_file_from_archive_entry(prop_dictionary_t filesd,
* File not installed, install new one. * File not installed, install new one.
*/ */
install_new = true; install_new = true;
xbps_dbg_printf("%s: conf_file %s not "
"installed\n", pkgname,
archive_entry_pathname(entry));
break; break;
} else { } else {
rv = errno; rv = errno;
@ -186,6 +188,9 @@ xbps_config_file_from_archive_entry(prop_dictionary_t filesd,
(strcmp(sha256_orig, sha256_new) == 0) && (strcmp(sha256_orig, sha256_new) == 0) &&
(strcmp(sha256_cur, sha256_new) == 0)) { (strcmp(sha256_cur, sha256_new) == 0)) {
install_new = true; install_new = true;
xbps_dbg_printf("%s: conf_file %s orig = X,"
"cur = X, new = X\n", pkgname,
archive_entry_pathname(entry));
break; break;
/* /*
* Orig = X, Curr = X, New = Y * Orig = X, Curr = X, New = Y
@ -219,6 +224,9 @@ xbps_config_file_from_archive_entry(prop_dictionary_t filesd,
(strcmp(sha256_orig, sha256_new)) && (strcmp(sha256_orig, sha256_new)) &&
(strcmp(sha256_orig, sha256_cur))) { (strcmp(sha256_orig, sha256_cur))) {
install_new = true; install_new = true;
xbps_dbg_printf("%s: conf_file %s orig = X,"
"cur = Y, new = Y\n", pkgname,
archive_entry_pathname(entry));
break; break;
/* /*
* Orig = X, Curr = Y, New = Z * Orig = X, Curr = Y, New = Z
@ -254,5 +262,8 @@ out:
prop_object_iterator_release(iter); prop_object_iterator_release(iter);
xbps_dbg_printf("%s: conf_file %s returned %d\n",
pkgname, archive_entry_pathname(entry));
return rv; return rv;
} }