Skip to Content.
Sympa Menu

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

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 (52b245813ee2d999a7526a7804ca0dcda41f758c)
  • Date: Sat, 5 Jul 2008 07:21:46 -0500

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

ChangeLog | 4 ++++
var/lib/sorcery/modules/libstage | 24 ++++++++++++++++--------
2 files changed, 20 insertions(+), 8 deletions(-)

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

libstage:
fixed a regression that caused us not to install excluded configs #14339

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

libstage: install the rest of the files first, so any leading directories
the configs need get properly created; renamed stage_install_rest to
stage_install_ordinary

diff --git a/ChangeLog b/ChangeLog
index 0662597..a0a19c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
* libqueue: made the old method print all the reasons for queuing.
This
way the behaviour is consistent with the new method and
multiversioned
spells have all the reasons printed
+ * libstage: install the rest of the files first, so any leading
directories
+ the configs need get properly created; renamed stage_install_rest to
+ stage_install_ordinary
+ fixed a regression that caused us not to install excluded configs
#14339

2008-07-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libmisc: removed older, commented-out versions of
config_[gs]et_option
diff --git a/var/lib/sorcery/modules/libstage
b/var/lib/sorcery/modules/libstage
index 0322599..2ea25a2 100755
--- a/var/lib/sorcery/modules/libstage
+++ b/var/lib/sorcery/modules/libstage
@@ -12,11 +12,11 @@
#---------------------------------------------------------------------
function transfer_staged_spell()
{
+ stage_install_ordinary
lock_file "$CONFIG_STAGE_DIRECTORY/$SPELL"
mkdir -p "$CONFIG_STAGE_DIRECTORY/$SPELL/current"
stage_install_configs
unlock_file "$CONFIG_STAGE_DIRECTORY/$SPELL"
- stage_install_rest
}

function filter_spell_configs()
@@ -25,23 +25,31 @@ function filter_spell_configs()
}

#---------------------------------------------------------------------
-## Install config files to a staged location on the system
+## Install config files to a staged location on the system or if
+## they are also excluded, just install them normally.
#---------------------------------------------------------------------
function stage_install_configs()
{
+ local spell_configs=$(get_all_package_files | filter_spell_configs -v)
+
+ # install excluded configs as ordinary files - do not stage them
+ message "${MESSAGE_COLOR}Installing excluded config files${DEFAULT_COLOR}"
+ echo "$spell_configs" |
+ filter_excluded -v |
+ stage_install_files
+
message "${MESSAGE_COLOR}Staging config files into the
system${DEFAULT_COLOR}"
- get_all_package_files |
- filter_spell_configs -v |
- filter_excluded |
+ echo "$spell_configs" |
+ filter_excluded |
stage_install_files config
}

#---------------------------------------------------------------------
-## Install the rest of the files in the stage root
+## Install non-configs in the stage root
#---------------------------------------------------------------------
-function stage_install_rest()
+function stage_install_ordinary()
{
- message "${MESSAGE_COLOR}Installing the rest of the files${DEFAULT_COLOR}"
+ message "${MESSAGE_COLOR}Installing ordinary files${DEFAULT_COLOR}"
get_all_package_files |
filter_spell_configs |
stage_install_files



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (52b245813ee2d999a7526a7804ca0dcda41f758c), Jaka Kranjc, 07/05/2008

Archive powered by MHonArc 2.6.24.

Top of Page