lib/repo: Add error prefixing during hardlink object import
authorColin Walters <walters@verbum.org>
Tue, 5 Sep 2017 16:06:46 +0000 (12:06 -0400)
committerAtomic Bot <atomic-devel@projectatomic.io>
Thu, 7 Sep 2017 15:16:24 +0000 (15:16 +0000)
I happened to have a repo with a missing commit object, and got an unprefixed
error during a pull-local.

Closes: #1129
Approved by: jlebon

src/libostree/ostree-repo.c

index 430f6631d7171226fe96bc64bfc3318f02b6a882..70672ae0d9ed11cdea64ec605139c54427b540f7 100644 (file)
@@ -3350,6 +3350,9 @@ import_one_object_link (OstreeRepo    *self,
                         GCancellable  *cancellable,
                         GError        **error)
 {
+  const char *errprefix = glnx_strjoina ("Importing ", checksum, ".",
+                                         ostree_object_type_to_string (objtype));
+  GLNX_AUTO_PREFIX_ERROR (errprefix, error);
   char loose_path_buf[_OSTREE_LOOSE_PATH_MAX];
   _ostree_loose_path (loose_path_buf, checksum, objtype, self->mode);
 
@@ -3396,7 +3399,7 @@ import_one_object_link (OstreeRepo    *self,
           return TRUE;
         }
       else
-        return glnx_throw_errno (error);
+        return glnx_throw_errno_prefix (error, "linkat");
     }
 
   if (objtype == OSTREE_OBJECT_TYPE_COMMIT)