[ostree/wip/ostbuild-chroot-dev: 1/10] compose: Don't print trailing (null) if we skip committing



commit 9dc86d0f5e8ac5d48065b13db205aa8110dbb39f
Author: Colin Walters <walters verbum org>
Date:   Fri Feb 24 21:35:31 2012 -0500

    compose: Don't print trailing (null) if we skip committing
    
    If we skip a commit due to an idential content parent, we shouldn't
    print the (null) commit checksum.

 src/ostree/ot-builtin-compose.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/src/ostree/ot-builtin-compose.c b/src/ostree/ot-builtin-compose.c
index 5019dfa..48375e0 100644
--- a/src/ostree/ot-builtin-compose.c
+++ b/src/ostree/ot-builtin-compose.c
@@ -251,6 +251,8 @@ ostree_builtin_compose (int argc, char **argv, GFile *repo_path, GError **error)
 
       if (!ostree_repo_write_ref (repo, NULL, branch, commit_checksum, error))
         goto out;
+
+      g_print ("%s\n", commit_checksum);
     }
   else
     {
@@ -263,7 +265,6 @@ ostree_builtin_compose (int argc, char **argv, GFile *repo_path, GError **error)
     }
 
   ret = TRUE;
-  g_print ("%s\n", commit_checksum);
  out:
   if (in_transaction)
     {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]