Skip to Content.
Sympa Menu

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

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 (bef8260cebbbcf52c512d39c783b24118dca2da2)
  • Date: Tue, 29 Jan 2008 04:08:46 -0600

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

ChangeLog | 4 ++++
etc/sorcery/local/README | 2 +-
usr/sbin/confmeld | 7 ++++---
var/lib/sorcery/modules/libresurrect | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)

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

confmeld, libressurect: improved the merge message for better readability

commit e770fc607bbce8e6622acfa7d5778141a6604e78
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

local/README: fixed typo

diff --git a/ChangeLog b/ChangeLog
index 8a3429f..1e8e15b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * local/README: fixed typo
+ * confmeld, libressurect: improved the merge message for better
readability
+
2008-01-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* cast: suggest the user to run confmeld if there are any deferred
files.
fixes the second third of #13618
diff --git a/etc/sorcery/local/README b/etc/sorcery/local/README
index b5e659d..ecb66dd 100755
--- a/etc/sorcery/local/README
+++ b/etc/sorcery/local/README
@@ -4,6 +4,6 @@ configuration files.
"/etc/sorcery/local/config" contains the variables that
you wish to override in /etc/sorcery/config.

-Addtionally, "/etc/sorcery/local" stores your config for
+Additionally, "/etc/sorcery/local" stores your config for
Linus Torvalds' Linux Kernel and XFree86.

diff --git a/usr/sbin/confmeld b/usr/sbin/confmeld
index 68a5bfd..1a8a746 100755
--- a/usr/sbin/confmeld
+++ b/usr/sbin/confmeld
@@ -113,8 +113,9 @@ function main()
parse_stage_config_path $file spell sdate target &&
if [[ -f $file && $target ]]
then
- message "${MESSAGE_COLOR}$spell cast on $sdate has
config${DEFAULT_COLOR}"
- message "${MESSAGE_COLOR}$file to be merged with
/$target${DEFAULT_COLOR}"
+ message "${SPELL_COLOR}$spell$DEFAULT_COLOR cast on $sdate has config"
+ message "${FILE_COLOR}$file$DEFAULT_COLOR"
+ message "to be merged with $FILE_COLOR/$target${DEFAULT_COLOR}\n"
tablet_set_spell $spell &&
install_config_file $file $INSTALL_ROOT/$target
#
@@ -149,7 +150,7 @@ function main()
#
if [[ $last_spell ]]
then
- message "${MESSAGE_COLOR}Removing dirs and files in config stage
area.${DEFAULT_COLOR}"
+ message "\n${MESSAGE_COLOR}Removing dirs and files in config stage
area.${DEFAULT_COLOR}"
rm_source_dir $CONFIG_STAGE_DIRECTORY/$last_spell
fi
find $CONFIG_STAGE_DIRECTORY -mindepth 1 -maxdepth 2 -type d -empty -delete
diff --git a/var/lib/sorcery/modules/libresurrect
b/var/lib/sorcery/modules/libresurrect
index cfb2c9a..d9a3921 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -513,7 +513,7 @@ function real_handle_changed_config() {
local continue=yes
message "${MESSAGE_COLOR}Installing to $to, please choose an option:"
while [[ "$continue" == "yes" ]] ; do
- message "${QUERY_COLOR}"
+ message -n "${QUERY_COLOR}"
message "(0) trash $to and install over it"
message "(1) backup $to to $to.$savetime.old, install the new file in
its place"
message "(2) leave $to in its place, copy the new file to
$to.$savetime.new"



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (bef8260cebbbcf52c512d39c783b24118dca2da2), Jaka Kranjc, 01/29/2008

Archive powered by MHonArc 2.6.24.

Top of Page