From 0efdc0cf6f47278184eecdf47137b6253043e027 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 27 Feb 2012 00:40:22 -0600 Subject: The "id" of an item now maps to its UUID --- src/convert.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/convert.cc') diff --git a/src/convert.cc b/src/convert.cc index da4569cc..15995d05 100644 --- a/src/convert.cc +++ b/src/convert.cc @@ -74,21 +74,21 @@ value_t convert_command(call_scope_t& args) post->amount.in_place_negate(); } - string ref = (xact->has_tag(_("SHA1")) ? - xact->get_tag(_("SHA1"))->to_string() : + string ref = (xact->has_tag(_("UUID")) ? + xact->get_tag(_("UUID"))->to_string() : sha1sum(reader.get_last_line())); checksum_map_t::const_iterator entry = journal.checksum_map.find(ref); if (entry != journal.checksum_map.end()) { INFO(file_context(reader.get_pathname(), reader.get_linenum()) - << "Ignoring known SHA1 " << ref); + << "Ignoring known UUID " << ref); checked_delete(xact); // ignore it continue; } - if (report.HANDLED(rich_data) && ! xact->has_tag(_("SHA1"))) - xact->set_tag(_("SHA1"), string_value(ref)); + if (report.HANDLED(rich_data) && ! xact->has_tag(_("UUID"))) + xact->set_tag(_("UUID"), string_value(ref)); if (xact->posts.front()->account == NULL) { if (account_t * acct = -- cgit v1.2.3