Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (6d36b7b6e07a23b207525cefe913f077b41319cb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (6d36b7b6e07a23b207525cefe913f077b41319cb)
  • Date: Sun, 10 Feb 2008 08:51:18 -0600

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 3 +++
usr/sbin/confmeld | 8 ++++++--
2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 6d36b7b6e07a23b207525cefe913f077b41319cb
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

confmeld: made the date of staging human readable

date doesn't support our input nor can it show just hours localised, so
only the major part of the output string is localised.

diff --git a/ChangeLog b/ChangeLog
index 0859541..5e083d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-02-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * confmeld: made the date of staging human readable
+
2008-02-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libunpack: improved the error message in unpack_hash with info
which hash
is which
diff --git a/usr/sbin/confmeld b/usr/sbin/confmeld
index 8deb56e..7dc13a6 100755
--- a/usr/sbin/confmeld
+++ b/usr/sbin/confmeld
@@ -195,12 +195,16 @@ function final_cleanup()
#--------------------------------------------------------------------
function merge_single_file()
{
- local file=$1 spell sdate target
+ local file=$1 spell sdate target nice_date

parse_stage_config_path $file spell sdate target &&
if [[ -f $file && $target ]]
then
- message "${SPELL_COLOR}$spell$DEFAULT_COLOR cast on $sdate has config"
+ # make the $sdate human readable
+ # date -d can't use the whole original, so we have to do it in steps
+ nice_date=$(date -d ${sdate:0:8} "+%a %d %b %Y")
+ nice_date="$nice_date $(date -d ${sdate:8:4} "+%X %Z")"
+ message "${SPELL_COLOR}$spell$DEFAULT_COLOR cast on $nice_date has
config"
message "${FILE_COLOR}$file$DEFAULT_COLOR"
message "to be merged with $FILE_COLOR/$target${DEFAULT_COLOR}\n"
tablet_set_spell $spell &&



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (6d36b7b6e07a23b207525cefe913f077b41319cb), Jaka Kranjc, 02/10/2008

Archive powered by MHonArc 2.6.24.

Top of Page