Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by David Brown (3446ec29937fa20b050407927874664bd56c5aa3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Brown <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by David Brown (3446ec29937fa20b050407927874664bd56c5aa3)
  • Date: Sun, 23 Jul 2006 11:54:03 -0500

GIT changes to master sorcery by David Brown <dmlb2000@kajit-master.(none)>:

ChangeLog | 5 ++++
var/lib/sorcery/modules/libstage | 42
++++++++++++++++++++++++++-------------
2 files changed, 34 insertions(+), 13 deletions(-)

New commits:
commit 3446ec29937fa20b050407927874664bd56c5aa3
Author: David Brown <dmlb2000@kajit-master.(none)>
Commit: David Brown <dmlb2000@kajit-master.(none)>

libstage chown calls and output fixes bug #12821

diff --git a/ChangeLog b/ChangeLog
index af5e66e..3e0c1eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-23 David Brown <dmlb2000 AT gmail.com>
+ * libstage: added output of owner and group to making files in the
+ system also added a readlink call to the output of symlink also
+ added chown of fifo's blocks and directories (fixes bug #12821)
+
2006-07-15 Andrew Stitt <astitt AT sourcemage.org>
* archspecs: remove, users should get them from smgl-archspecs now

diff --git a/var/lib/sorcery/modules/libstage
b/var/lib/sorcery/modules/libstage
index 9f78ff8..61f6ad5 100755
--- a/var/lib/sorcery/modules/libstage
+++ b/var/lib/sorcery/modules/libstage
@@ -70,19 +70,23 @@ function stage_install_directory()
{
local DIR=$1
local PERMISSION=$(stat -c %a "${STAGE_DIRECTORY}/TRANSL/${DIR}")
+ local OWNER=$(stat -c %U "${STAGE_DIRECTORY}/TRANSL/${DIR}")
+ local GROUP=$(stat -c %G "${STAGE_DIRECTORY}/TRANSL/${DIR}")
if [[ ! -d $(dirname "${INSTALL_ROOT}/$DIR") ]]
then
# this shouldn't happen but just in case
message "${PROBLEM_COLOR}Ah, not preserving permissions making $(dirname
$DIR)${DEFAULT_COLOR}" &&
mkdir -p $(dirname "${INSTALL_ROOT}/$DIR")
fi &&
- message "${FILE_COLOR}$PERMISSION $DIR${DEFAULT_COLOR}" &&
+ message "${FILE_COLOR}$PERMISSION $OWNER:$GROUP $DIR${DEFAULT_COLOR}" &&
if [[ -d "$DIR" ]]
then
- chmod "$PERMISSION" "${INSTALL_ROOT}/$DIR"
+ chmod "$PERMISSION" "${INSTALL_ROOT}/$DIR" &&
+ chown $OWNER:$GROUP "${INSTALL_ROOT}/$DIR"
else
mkdir "$DIR" &&
- chmod "$PERMISSION" "${INSTALL_ROOT}/$DIR"
+ chmod "$PERMISSION" "${INSTALL_ROOT}/$DIR" &&
+ chown $OWNER:$GROUP "${INSTALL_ROOT}/$DIR"
fi
}

@@ -90,8 +94,10 @@ function stage_install_file()
{
local FILE=$1
local PERMISSION=$(stat -c %a "${STAGE_DIRECTORY}/TRANSL/$FILE")
+ local OWNER=$(stat -c %U "${STAGE_DIRECTORY}/TRANSL/$FILE")
+ local GROUP=$(stat -c %G "${STAGE_DIRECTORY}/TRANSL/$FILE")
local SAVE="$CONFIG_STAGE_DIRECTORY/$SPELL/current/$FILE"
- message "${FILE_COLOR}$PERMISSION $FILE${DEFAULT_COLOR}"
+ message "${FILE_COLOR}$PERMISSION $OWNER:$GROUP $FILE${DEFAULT_COLOR}"
case $2 in
config)
if [[ -e "${INSTALL_ROOT}/$FILE" ]]
@@ -113,7 +119,7 @@ function stage_install_symlink()
{
local FILE=$1
local SAVE=$CONFIG_STAGE_DIRECTORY/$FILE.$(date +%Y%m%d%H%M%S)
- message "${FILE_COLOR}Symlink $FILE${DEFAULT_COLOR}"
+ message "${FILE_COLOR}Symlink $FILE -> $(readlink
"$STAGE_DIRECTORY/TRANSL/$FILE")${DEFAULT_COLOR}"
case $2 in
config)
if [[ -e "${INSTALL_ROOT}/$FILE" ]]
@@ -135,20 +141,25 @@ function stage_install_fifo()
{
local FILE=$1
local SAVE=$CONFIG_STAGE_DIRECTORY/$FILE.$(date +%Y%m%d%H%M%S)
- message "${FILE_COLOR}Fifo $FILE${DEFAULT_COLOR}"
+ local OWNER=$(stat -c %U "${STAGE_DIRECTORY}/TRANSL/$FILE")
+ local GROUP=$(stat -c %G "${STAGE_DIRECTORY}/TRANSL/$FILE")
+ message "${FILE_COLOR}Fifo $OWNER:$GROUP $FILE${DEFAULT_COLOR}"
case $2 in
config)
if [[ -e "${INSTALL_ROOT}/$FILE" ]]
then
touch "${INSTALL_ROOT}/$FILE" &&
mkdir -p $(dirname $SAVE) &&
- mkfifo "${INSTALL_ROOT}/$SAVE"
+ mkfifo "${INSTALL_ROOT}/$SAVE" &&
+ chown $OWNER:$GROUP "${INSTALL_ROOT}/$SAVE"
else
- mkfifo "${INSTALL_ROOT}/$FILE"
+ mkfifo "${INSTALL_ROOT}/$FILE" &&
+ chown $OWNER:$GROUP "${INSTALL_ROOT}/$FILE"
fi
;;
*)
- mkfifo "${INSTALL_ROOT}/$FILE"
+ mkfifo "${INSTALL_ROOT}/$FILE" &&
+ chown $OWNER:$GROUP "${INSTALL_ROOT}/$FILE"
;;
esac
}
@@ -159,22 +170,27 @@ function stage_install_char_block()
local PERMISSION=$(stat -c %a "${STAGE_DIRECTORY}/TRANSL/$FILE")
local MAJOR=$(stat -c %t "${STAGE_DIRECTORY}/TRANSL/$FILE")
local MINOR=$(stat -c %T "${STAGE_DIRECTORY}/TRANSL/$FILE")
+ local OWNER=$(stat -c %U "${STAGE_DIRECTORY}/TRANSL/$FILE")
+ local GROUP=$(stat -c %G "${STAGE_DIRECTORY}/TRANSL/$FILE")
local SAVE=$CONFIG_STAGE_DIRECTORY/$FILE.$(date +%Y%m%d%H%M%S)
local TYPE=$3
- message "${FILE_COLOR}${PERMISSION} $TYPE $MAJOR $MINOR
$FILE${DEFAULT_COLOR}"
+ message "${FILE_COLOR}${PERMISSION} $OWNER:$GROUP $TYPE $MAJOR $MINOR
$FILE${DEFAULT_COLOR}"
case $2 in
config)
if [[ -e "${INSTALL_ROOT}/$FILE" ]]
then
touch "${INSTALL_ROOT}/$FILE" &&
mkdir -p $(dirname $SAVE) &&
- mknod -m "${PERMISSION}" "${INSTALL_ROOT}/$SAVE" "${TYPE}"
"${MAJOR}" "${MINOR}"
+ mknod -m "${PERMISSION}" "${INSTALL_ROOT}/$SAVE" "${TYPE}"
"${MAJOR}" "${MINOR}" &&
+ chown $OWNER:$GROUP "${INSTALL_ROOT}/$SAVE"
else
- mknod -m "${PERMISSION}" "${INSTALL_ROOT}/$FILE" "${TYPE}"
"${MAJOR}" "${MINOR}"
+ mknod -m "${PERMISSION}" "${INSTALL_ROOT}/$FILE" "${TYPE}"
"${MAJOR}" "${MINOR}" &&
+ chown $OWNER:$GROUP "${INSTALL_ROOT}/$FILE"
fi
;;
*)
- mknod -m "${PERMISSION}" "${INSTALL_ROOT}/$FILE" "${TYPE}" "${MAJOR}"
"${MINOR}"
+ mknod -m "${PERMISSION}" "${INSTALL_ROOT}/$FILE" "${TYPE}" "${MAJOR}"
"${MINOR}" &&
+ chown $OWNER:$GROUP "${INSTALL_ROOT}/$FILE"
;;
esac
}



  • [SM-Commit] GIT changes to master sorcery by David Brown (3446ec29937fa20b050407927874664bd56c5aa3), David Brown, 07/23/2006

Archive powered by MHonArc 2.6.24.

Top of Page