packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit: add --timestamp=TIMESTAMP 

It allows to override the timestamp of the commit.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2015-11-09 10:35:46 +00:00
parent 14ffd7022a
commit 68f70d8e74
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/ostree-commit.xml
View File

@ -198,6 +198,14 @@ Boston, MA 02111-1307, USA.
GPG home directory to use when looking for keyrings (if have GPGME - GNU Privacy Guard Made Easy). GPG home directory to use when looking for keyrings (if have GPGME - GNU Privacy Guard Made Easy).
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><option>--timestamp</option>="TIMESTAMP"</term>
<listitem><para>
Override the timestamp of the commit to TIMESTAMP.
</para></listitem>
</varlistentry>
</variablelist> </variablelist>
</refsect1> </refsect1>

29
src/ostree/ot-builtin-commit.c
View File

@ -28,6 +28,7 @@
#include "ostree.h" #include "ostree.h"
#include "otutil.h" #include "otutil.h"
#include "ot-tool-util.h" #include "ot-tool-util.h"
#include "parse-datetime.h"
static char *opt_subject; static char *opt_subject;
static char *opt_body; static char *opt_body;
@ -47,6 +48,7 @@ static char **opt_key_ids;
static char *opt_gpg_homedir; static char *opt_gpg_homedir;
static gboolean opt_generate_sizes; static gboolean opt_generate_sizes;
static gboolean opt_disable_fsync; static gboolean opt_disable_fsync;
static char *opt_timestamp;
static gboolean static gboolean
parse_fsync_cb (const char *option_name, parse_fsync_cb (const char *option_name,
@ -84,6 +86,7 @@ static GOptionEntry options[] = {
{ "generate-sizes", 0, 0, G_OPTION_ARG_NONE, &opt_generate_sizes, "Generate size information along with commit metadata", NULL }, { "generate-sizes", 0, 0, G_OPTION_ARG_NONE, &opt_generate_sizes, "Generate size information along with commit metadata", NULL },
{ "disable-fsync", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &opt_disable_fsync, "Do not invoke fsync()", NULL }, { "disable-fsync", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &opt_disable_fsync, "Do not invoke fsync()", NULL },
{ "fsync", 0, 0, G_OPTION_ARG_CALLBACK, parse_fsync_cb, "Specify how to invoke fsync()", "POLICY" }, { "fsync", 0, 0, G_OPTION_ARG_CALLBACK, parse_fsync_cb, "Specify how to invoke fsync()", "POLICY" },
{ "timestamp", 0, 0, G_OPTION_ARG_STRING, &opt_timestamp, "Override the timestamp of the commit", "TIMESTAMP" },
{ NULL } { NULL }
}; };
@ -488,9 +491,29 @@ ostree_builtin_commit (int argc, char **argv, GCancellable *cancellable, GError
if (!skip_commit) if (!skip_commit)
{ {
gboolean update_summary; gboolean update_summary;
if (!ostree_repo_write_commit (repo, parent, opt_subject, opt_body, metadata, guint64 timestamp;
OSTREE_REPO_FILE (root), if (!opt_timestamp)
&commit_checksum, cancellable, error)) {
GDateTime *now = g_date_time_new_now_utc ();
timestamp = g_date_time_to_unix (now);
g_date_time_unref (now);
}
else
{
struct timespec ts;
if (!parse_datetime (&ts, opt_timestamp, NULL))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Could not parse '%s'", opt_timestamp);
goto out;
}
timestamp = ts.tv_sec;
}
if (!ostree_repo_write_commit_with_time (repo, parent, opt_subject, opt_body, metadata,
OSTREE_REPO_FILE (root),
timestamp,
&commit_checksum, cancellable, error))
goto out; goto out;
if (detached_metadata) if (detached_metadata)