[ostree] core: Fix mkdtemp invocation
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] core: Fix mkdtemp invocation
- Date: Wed, 6 Jun 2012 14:04:19 +0000 (UTC)
commit a14ff0aeabbc6082a21766b1a960d74b113b550a
Author: Colin Walters <walters verbum org>
Date: Wed Jun 6 10:02:37 2012 -0400
core: Fix mkdtemp invocation
src/libostree/ostree-core.c | 5 ++---
src/ostadmin/ot-admin-builtin-deploy.c | 1 -
2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index 3d4bace..ce860e5 100644
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -1323,10 +1323,9 @@ ostree_create_temp_dir (GFile *dir,
if (dir == NULL)
dir = g_file_new_for_path (g_get_tmp_dir ());
- template = g_strdup_printf ("%s/%s-XXXXXX-%s",
+ template = g_strdup_printf ("%s/%s-XXXXXX",
ot_gfile_get_path_cached (dir),
- prefix ? prefix : "tmp",
- suffix ? suffix : "tmp");
+ prefix ? prefix : "tmp");
if (mkdtemp (template) == NULL)
{
diff --git a/src/ostadmin/ot-admin-builtin-deploy.c b/src/ostadmin/ot-admin-builtin-deploy.c
index 509cb14..ee20f85 100644
--- a/src/ostadmin/ot-admin-builtin-deploy.c
+++ b/src/ostadmin/ot-admin-builtin-deploy.c
@@ -79,7 +79,6 @@ update_initramfs (const char *release,
ot_lobj GFile *initramfs_tmp_file = NULL;
ot_lobj GFileInfo *initramfs_tmp_info = NULL;
-
if (!ostree_create_temp_dir (NULL, "ostree-initramfs", NULL, &tmpdir,
cancellable, error))
goto out;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]