Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (34c17dc38461796b50b19c41c23806702d3ce997)

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 test-1.14 sorcery by Jaka Kranjc (34c17dc38461796b50b19c41c23806702d3ce997)
  • Date: Mon, 29 Dec 2008 15:08:06 -0600

GIT changes to test-1.14 sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 10 ++++++++++
etc/sorcery/version | 2 +-
var/lib/sorcery/excluded | 1 +
var/lib/sorcery/modules/build_api/common | 2 +-
var/lib/sorcery/modules/libcast | 2 +-
var/lib/sorcery/modules/libgrimoire | 2 +-
var/lib/sorcery/modules/libinitd | 8 ++++----
var/lib/sorcery/modules/libtrack | 1 +
8 files changed, 20 insertions(+), 8 deletions(-)

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

1.14.3-rc3

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

libtrack: avoid an installwatch issue in create_install_log #14835

(cherry-picked from commit 43fd7fc4beb5b1ed3f367edee26076fc91f0a103)

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

libcast, libinitd, libgrimoire, common: ensure most grimoire files
have correct ownership #14576

(cherry-picked from commit 1746388975ee2ddb8532422efdb83d91e0ef4cd8)

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

excluded: added /etc/.pwd.lock to fix #5924

(cherry-picked from commit 15b74ea8bced72cdf600dbe176687e0dd295e51f)

diff --git a/ChangeLog b/ChangeLog
index 194b3a4..9be40a5 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-12-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libtrack: avoid an installwatch issue in create_install_log #14835
+
+2008-12-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libcast, libinitd, libgrimoire, common: ensure most grimoire files
+ have correct ownership #14576
+
+2008-12-15 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * excluded: added /etc/.pwd.lock to fix #5924
+
2008-12-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libcast: fixed a syntax error in custom cppflag setting, patch from
Mario GarcĂ­a H. #14954
diff --git a/etc/sorcery/version b/etc/sorcery/version
index 3ab7cd0..00e6e7c 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.3-rc2
+1.14.3-rc3
diff --git a/var/lib/sorcery/excluded b/var/lib/sorcery/excluded
index 98e5b79..bd2ef48 100755
--- a/var/lib/sorcery/excluded
+++ b/var/lib/sorcery/excluded
@@ -1,5 +1,6 @@
^/dev
^/devices
+^/etc/.pwd.lock$
^/etc/X11/xdm/Xsession$
^/etc/cups/certs
^/etc/fstab$
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index f3295fe..1fab067 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -218,7 +218,7 @@ function install_pam_confs() {
local FILE
for FILE in `ls`; do
if ! [ -f $INSTALL_ROOT/etc/pam.d/$FILE ]; then
- cp $FILE $INSTALL_ROOT/etc/pam.d
+ install -g root -o root "$FILE" "$INSTALL_ROOT/etc/pam.d"
fi
done

diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index 0cb6d8d..6f19f11 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -518,7 +518,7 @@ function install_xinetd_sub() {
local install_dir=$3
local tmp_file=$TMP_DIR/$bfile
local inst_file=$install_dir/$bfile
- cp $file $tmp_file
+ install -g root -o root $file $tmp_file

set_xinetd_state $tmp_file $state

diff --git a/var/lib/sorcery/modules/libgrimoire
b/var/lib/sorcery/modules/libgrimoire
index cd54495..811b31e 100755
--- a/var/lib/sorcery/modules/libgrimoire
+++ b/var/lib/sorcery/modules/libgrimoire
@@ -184,7 +184,7 @@ function install_desktop_files() {
file=$(basename $each)
if ! test -f "$target_dir/$file" ; then
debug "libgrimoire" "Installing $file in $target_dir as a desktop file"
- cp $each $target_dir
+ install -g root -o root $each $target_dir
fi
done
}
diff --git a/var/lib/sorcery/modules/libinitd
b/var/lib/sorcery/modules/libinitd
index 5cb2003..c9b4148 100755
--- a/var/lib/sorcery/modules/libinitd
+++ b/var/lib/sorcery/modules/libinitd
@@ -99,7 +99,7 @@ function _init_merge_config_file()
fi

local savetime=$( date +'%Y%m%d%H%M' )
- cp $2 $2.$savetime.backup
+ install -g root -o root $2 $2.$savetime.backup

for opt in $new_opts ; do
message " Merging option $opt into $2..."
@@ -144,7 +144,7 @@ function _init_install_conf_files()
check_if_modified "$target_file" && mark_file_modified "$target_file"
_init_merge_config_file $file $target_file
else
- install -m 644 $file $target_file
+ install -m 644 -g root -o root $file $target_file
touch $target_file
fi
done
@@ -229,11 +229,11 @@ function init_install()
else
_init_make_backup $script_path $runlevel_dir/$script_name
if [ "$enable_script" == "enabled" ] ; then
- install -m 754 $script_path $runlevel_dir
+ install -m 754 -g root -o root $script_path $runlevel_dir
message " script $script_name installed and
${MESSAGE_COLOR}enabled${DEFAULT_COLOR}. Disable with 'telinit disable
$script_name'."
message "${MESSAGE_COLOR}If you want to [re]start the service
now${DEFAULT_COLOR}, issue 'telinit run $script_name [re]start'."
else
- install -m 644 $script_path $runlevel_dir
+ install -m 644 -g root -o root $script_path $runlevel_dir
message " script $script_name installed and
${MESSAGE_COLOR}disabled${DEFAULT_COLOR}. Enable with 'telinit enable
$script_name'."
fi
_init_install_conf_files $( _init_get_conf_files $script_path )
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index 9e9a29b..fb54bed 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -227,6 +227,7 @@ function create_install_log() {
filter_excluded > $OUTPUT
else
parse_iw $INPUT |
+ sed "s#/\(\./\)\+#/#g" |
sort |
uniq |
install_log_filter $INSTALL_ROOT "" |



  • [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (34c17dc38461796b50b19c41c23806702d3ce997), Jaka Kranjc, 12/29/2008

Archive powered by MHonArc 2.6.24.

Top of Page