mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-11-05 16:04:31 +00:00
Adding a small fix to rpmInstall. Package name must be null terminated.
This commit is contained in:
parent
2d16a68597
commit
2cbdce7b1d
2 changed files with 14 additions and 5 deletions
|
@ -1,3 +1,10 @@
|
|||
|
||||
2000-04-18 Shane Culpepper <pepper@eazel.com>
|
||||
|
||||
* components/services/install/eazel-install-lib-rpm.c - fixing the
|
||||
segfault in rpmInstall.
|
||||
|
||||
|
||||
2000-04-19 John Sullivan <sullivan@eazel.com>
|
||||
|
||||
* libnautilus-extensions/nautilus-directory.c:
|
||||
|
@ -104,6 +111,7 @@
|
|||
Changed to use nautilus_directory_contains_file instead of
|
||||
nautilus_file_is_gone.
|
||||
|
||||
>>>>>>> 1.38
|
||||
2000-04-18 Ramiro Estrugo <ramiro@eazel.com>
|
||||
|
||||
* components/services/install/.cvsignore: Ignore more generated
|
||||
|
|
|
@ -47,17 +47,18 @@ install_new_packages (InstallOptions* iopts) {
|
|||
g_print ("Install Category - %s\n", c->name);
|
||||
while (t) {
|
||||
PackageData* pack = t->data;
|
||||
const char* pkg;
|
||||
const char* pkg[2];
|
||||
int retval;
|
||||
|
||||
retval = 0;
|
||||
|
||||
pkg = g_strdup_printf ("%s/%s", iopts->rpm_storage_dir, pack->rpm_name);
|
||||
g_print ("Installing Package = %s\n", pkg);
|
||||
retval = rpmInstall ("/", &pkg, 0, INSTALL_UPGRADE | INSTALL_HASH,
|
||||
pkg[0] = g_strdup_printf ("%s/%s", iopts->rpm_storage_dir, pack->rpm_name);
|
||||
pkg[1] = NULL;
|
||||
g_print ("Installing Package = %s\n", pkg[0]);
|
||||
retval = rpmInstall ("/", pkg, 0, INSTALL_UPGRADE | INSTALL_HASH,
|
||||
RPMPROB_FILTER_REPLACEPKG | RPMPROB_FILTER_OLDPACKAGE |
|
||||
RPMPROB_FILTER_REPLACEOLDFILES, NULL);
|
||||
if (retval > 0) {
|
||||
if (retval == 0) {
|
||||
g_print ("Package install successful!\n");
|
||||
rv = TRUE;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue