Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (fe7d7a183d441d818840586771bcf4c6b89455c9)
  • Date: Wed, 21 Jun 2006 09:51:27 -0500

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

printer/cups/CONFLICTS | 1 +
printer/cups/HISTORY | 5 +++++
printer/cups/PRE_BUILD | 33 ---------------------------------
printer/cups/TRIGGERS | 9 ++++-----
printer/cups/UP_TRIGGERS | 8 ++++++++
printer/gnulpr/CONFLICTS | 1 +
printer/gnulpr/HISTORY | 4 ++++
printer/gnulpr/PRE_BUILD | 35 -----------------------------------
printer/gnulpr/UP_TRIGGERS | 8 ++++++++
9 files changed, 31 insertions(+), 73 deletions(-)

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

cups, gnulpr: refactored conflict managment (#207)

diff --git a/printer/cups/CONFLICTS b/printer/cups/CONFLICTS
new file mode 100755
index 0000000..02f51bd
--- /dev/null
+++ b/printer/cups/CONFLICTS
@@ -0,0 +1 @@
+conflicts gnulpr
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index f9fefb2..dd00f19 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,8 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD: removed the conflict managment
+ * CONFLICTS, UP_TRIGGERS: (re)added (better way for #207)
+ * TRIGGERS: cleaned up
+
2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD: replaced 'gaze depends' call with
fast_up_depends, bug #10661
diff --git a/printer/cups/PRE_BUILD b/printer/cups/PRE_BUILD
index b69498c..9e10ad4 100755
--- a/printer/cups/PRE_BUILD
+++ b/printer/cups/PRE_BUILD
@@ -1,36 +1,3 @@
-if [ "`gaze installed | grep gnulpr | cut -d: -f1`" = "gnulpr"
]; then
- echo "This spell conflicts with gnulpr and will cause it and any
dependants to be dispelled."
-
- if query "Would you like to see a list of affected spells? " y; then
- fast_up_depends gnulpr
- echo "gnulpr"
-
- if query "Would you like to continue casting? " y; then
- for CASTED_SPELL in `fast_up_depends gnulpr`; do
- if [ "`gaze installed | grep $CASTED_SPELL | cut -d: -f1`"
= "$CASTED_SPELL" ]; then
- dispel $CASTED_SPELL
- fi
- done
-
- dispel gnulpr
- else
- return 1
- fi
- else
- if query "Would you like to continue casting? " y; then
- for CASTED_SPELL in `fast_up_depends gnulpr`; do
- if [ "`gaze installed | grep $CASTED_SPELL | cut -d: -f1`"
= "$CASTED_SPELL" ]; then
- dispel $CASTED_SPELL
- fi
- done
-
- dispel gnulpr
- else
- return 1
- fi
- fi
-fi &&
-
default_pre_build &&
cd $SOURCE_DIRECTORY &&

diff --git a/printer/cups/TRIGGERS b/printer/cups/TRIGGERS
index eaebbbf..88a0fa8 100755
--- a/printer/cups/TRIGGERS
+++ b/printer/cups/TRIGGERS
@@ -1,5 +1,4 @@
-for i in $(grep $SPELL $DEPENDS_STATUS); do
- if [ $(echo $i | cut -d: -f1) = "$SPELL" ] && [ $(echo $i | cut -d: -f2)
== "linux-pam" ] && [ $(echo $i | cut -d: -f3 ) = "on" ] ; then
- on_cast linux-pam cast_self
- fi
-done
+# replace with is_depends_enabled once it's available
+if grep -q "$SPELL:linux-pam:on" "$DEPENDS_STATUS"; then
+ on_cast linux-pam cast_self
+fi
diff --git a/printer/cups/UP_TRIGGERS b/printer/cups/UP_TRIGGERS
new file mode 100755
index 0000000..ab6af0e
--- /dev/null
+++ b/printer/cups/UP_TRIGGERS
@@ -0,0 +1,8 @@
+UPDEPS=$(fast_up_depends gnulpr 1)
+if [[ ! -z $UPDEPS ]]; then
+ message "${MESSAGE_COLOR}You need to recast some spells without gnulpr
support:" &&
+ message -n "$DEFAULT_COLOR" &&
+ for each in "$UPDEPS"; do
+ up_trigger $each cast_self
+ done
+fi
diff --git a/printer/gnulpr/CONFLICTS b/printer/gnulpr/CONFLICTS
new file mode 100755
index 0000000..634c9ae
--- /dev/null
+++ b/printer/gnulpr/CONFLICTS
@@ -0,0 +1 @@
+conflicts cups
diff --git a/printer/gnulpr/HISTORY b/printer/gnulpr/HISTORY
index ce1d7d5..66d52a3 100644
--- a/printer/gnulpr/HISTORY
+++ b/printer/gnulpr/HISTORY
@@ -1,3 +1,7 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD: removed
+ * CONFLICTS, UP_TRIGGERS: (re)added (better way for #207)
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line

diff --git a/printer/gnulpr/PRE_BUILD b/printer/gnulpr/PRE_BUILD
deleted file mode 100755
index 6ce72b3..0000000
--- a/printer/gnulpr/PRE_BUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-if [ "`gaze installed | grep cups | cut -d: -f1`" = "cups" ];
then
- echo "This spell conflicts with cups and will cause it and any dependants
to be dispelled."
-
- if query "Would you like to see a list of affected spells? " y; then
- fast_up_depends cups
- echo "cups"
-
- if query "Would you like to continue casting? " y; then
- for CASTED_SPELL in `fast_up_depends cups`; do
- if [ "`gaze installed | grep $CASTED_SPELL | cut -d: -f1`"
= "$CASTED_SPELL" ]; then
- dispel $CASTED_SPELL
- fi
- done
-
- dispel cups
- else
- return 1
- fi
- else
- if query "Would you like to continue casting? " y; then
- for CASTED_SPELL in `fast_up_depends cups`; do
- if [ "`gaze installed | grep $CASTED_SPELL | cut -d: -f1`"
= "$CASTED_SPELL" ]; then
- dispel $CASTED_SPELL
- fi
- done
-
- dispel cups
- else
- return 1
- fi
- fi
-fi
-
-
-default_pre_build
diff --git a/printer/gnulpr/UP_TRIGGERS b/printer/gnulpr/UP_TRIGGERS
new file mode 100755
index 0000000..489b588
--- /dev/null
+++ b/printer/gnulpr/UP_TRIGGERS
@@ -0,0 +1,8 @@
+UPDEPS=$(fast_up_depends cups 1)
+if [[ ! -z $UPDEPS ]]; then
+ message "${MESSAGE_COLOR}You need to recast some spells without cups
support:" &&
+ message -n "$DEFAULT_COLOR" &&
+ for each in "$UPDEPS"; do
+ up_trigger $each cast_self
+ done
+fi



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (fe7d7a183d441d818840586771bcf4c6b89455c9), Jaka Kranjc, 06/21/2006

Archive powered by MHonArc 2.6.24.

Top of Page