[ostree] pull-local: Fix regression with absolute paths
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] pull-local: Fix regression with absolute paths
- Date: Fri, 13 Feb 2015 16:40:13 +0000 (UTC)
commit 64363c26acfcc2e029dae138810310d3d6d8117e
Author: Colin Walters <walters verbum org>
Date: Fri Feb 13 11:39:02 2015 -0500
pull-local: Fix regression with absolute paths
Don't add cwd unless the path is relative.
src/ostree/ot-builtin-pull-local.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/src/ostree/ot-builtin-pull-local.c b/src/ostree/ot-builtin-pull-local.c
index acad43b..4588ccb 100644
--- a/src/ostree/ot-builtin-pull-local.c
+++ b/src/ostree/ot-builtin-pull-local.c
@@ -70,9 +70,13 @@ ostree_builtin_pull_local (int argc, char **argv, GCancellable *cancellable, GEr
src_repo_arg = argv[1];
- { gs_free char *cwd = g_get_current_dir ();
- src_repo_uri = g_strconcat ("file://", cwd, "/", src_repo_arg, NULL);
- }
+ if (src_repo_arg[0] == '/')
+ src_repo_uri = g_strconcat ("file://", src_repo_arg, NULL);
+ else
+ {
+ gs_free char *cwd = g_get_current_dir ();
+ src_repo_uri = g_strconcat ("file://", cwd, "/", src_repo_arg, NULL);
+ }
if (opt_disable_fsync)
ostree_repo_set_disable_fsync (repo, TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]