New commits:
commit 4d594d281630f28cac2d023b3e841eb6592d7dfc
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libcore: don't list bad secret keys when asking for GURU_GPGKEY
commit f9135df3505efe39f1d9b5db77d9e7fa3d5cd370
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
implement #13537
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index c6fd918..a0556ec 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libcore, libupdate: use cp -p to preserve timestamps #13537
+ * libcore: don't list bad secret keys when asking for GURU_GPGKEY
+ * version: ++
+
2007-02-17 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* libcore: added GURU_GPGKEY to quillrc, minor fix
* quill: respect quillrc
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index b0a370d..980072f 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -94,7 +94,7 @@ function quill_rc() {
QUILL_SUDO="su"
fi
if query "Do you use guru GPG signatures?" n ; then
- query_list "${QUERY_COLOR}Please select one of the following keys as
the guru signing key${DEFAULT_COLOR}" GURU_GPGKEY "" $(gpg -K | sed -n
"/^sec/ s,^sec\s*[^/]*/\(\S*\)\s.*$,\1,p")
+ query_list "${QUERY_COLOR}Please select one of the following keys as
the guru signing key${DEFAULT_COLOR}" GURU_GPGKEY "" $(gpg -K | sed -n
"/^sec[^#]/ s,^sec\s*[^/]*/\(\S*\)\s.*$,\1,p")
fi
message "Thank you. Now generating ${QUILL_QUILLRC}"
cat << QUA > $QUILL_QUILLRC
@@ -218,7 +218,7 @@ function quill_final_put_in_grimoire() {
rm -r "$QUILL_GRIM_NAME/$QUILL_SECT_NAME/$SPELL_NAME" || return 1
rm -f "$QUILL_SPELL_DIR/$SPELL_NAME/DETAILS.orig"
- cp -r $QUILL_SPELL_DIR/$SPELL_NAME $QUILL_GRIM_NAME/$QUILL_SECT_NAME/
+ cp -pr $QUILL_SPELL_DIR/$SPELL_NAME $QUILL_GRIM_NAME/$QUILL_SECT_NAME/
if [[ $? != 0 ]]; then
error_msg "Copying failed!"
return 1
diff --git a/var/lib/quill/modules/libupdate b/var/lib/quill/modules/libupdate
index 6acadf9..a32ce67 100644
--- a/var/lib/quill/modules/libupdate
+++ b/var/lib/quill/modules/libupdate
@@ -149,9 +149,9 @@ function copy_from_git()