[ostree] static-delta: assert on non-regular files

[Colin Walters <walters src gnome org>]

commit 153f092d5109aa4e288d0117b0f0aa2baa78b94c
Author: John Hiesey <john hiesey com>
Date:   Wed Aug 26 12:11:38 2015 -0700

    static-delta: assert on non-regular files
    
    Now that the computed similar objects are all regular files,
    get_unpacked_unlinked_content should never be called on any other
    object type. Assert that this is true instead of silently succeeding.

 .../ostree-repo-static-delta-compilation.c         |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)
---
diff --git a/src/libostree/ostree-repo-static-delta-compilation.c 
b/src/libostree/ostree-repo-static-delta-compilation.c
index aafe6fb..063c408 100644
--- a/src/libostree/ostree-repo-static-delta-compilation.c
+++ b/src/libostree/ostree-repo-static-delta-compilation.c
@@ -474,11 +474,7 @@ get_unpacked_unlinked_content (OstreeRepo       *repo,
                               cancellable, error))
     goto out;
 
-  if (g_file_info_get_file_type (ret_finfo) != G_FILE_TYPE_REGULAR)
-    {
-      ret = TRUE;
-      goto out;
-    }
+  g_assert (g_file_info_get_file_type (ret_finfo) == G_FILE_TYPE_REGULAR);
   
   out = g_unix_output_stream_new (fd, FALSE);
   if (g_output_stream_splice (out, istream, G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
@@ -571,13 +567,6 @@ try_content_rollsum (OstreeRepo                       *repo,
                                       cancellable, error))
     goto out;
 
-  /* Only try to rollsum regular files obviously */ 
-  if (!(tmp_from && tmp_to))
-    {
-      ret = TRUE;
-      goto out;
-    }
-
   matches = _ostree_compute_rollsum_matches (tmp_from, tmp_to);
 
   { guint match_ratio = (matches->bufmatches*100)/matches->total;