[SM-Commit] PERFORCE change 78597 by Arwed von Merkatz for review
Perforce Review Daemon
p4review at smee.org
Fri Apr 28 13:30:02 EDT 2006
Change 78597 by arwed_von_merkatz at arwed-Otherland on 2006/04/28 18:29:44
replaced calls to 'gaze depends' with fast_up_depends, added that to
libcompat, bug #10661
Affected files ...
... //sgl/grimoires/stable/0.3/ChangeLog#6 integrate
... //sgl/grimoires/stable/0.3/crypto/openssl/HISTORY#2 integrate
... //sgl/grimoires/stable/0.3/crypto/openssl/UP_TRIGGERS#2 integrate
... //sgl/grimoires/stable/0.3/libcompat#1 branch
... //sgl/grimoires/stable/0.3/perl-cpan/perl/HISTORY#2 integrate
... //sgl/grimoires/stable/0.3/perl-cpan/perl/UP_TRIGGERS#2 integrate
... //sgl/grimoires/stable/0.3/printer/cups/HISTORY#2 integrate
... //sgl/grimoires/stable/0.3/printer/cups/PRE_BUILD#2 integrate
... //sgl/grimoires/stable/0.3/printer/gnulpr/HISTORY#2 integrate
... //sgl/grimoires/stable/0.3/printer/gnulpr/PRE_BUILD#2 integrate
Differences ...
==== //sgl/grimoires/stable/0.3/ChangeLog#6 (text) ====
@@ -1,3 +1,6 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz at gmx.net>
+ * libcompat: added fast_up_depends function, bug #10661
+
2006-04-22 Arwed v. Merkatz <v.merkatz at gmx.net>
* mozilla.gpg: added the current mozilla signing key (1AF32821)
==== //sgl/grimoires/stable/0.3/crypto/openssl/HISTORY#2 (text) ====
@@ -1,3 +1,7 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz at gmx.net>
+ * UP_TRIGGERS: replaced 'gaze depends' call with
+ fast_up_depends, bug #10661
+
2005-10-11 Seth Woolley <seth at tautology.org>
* DETAILS: 0.9.7h SECURITY FIX
* Upgraded to sha512 source hash
==== //sgl/grimoires/stable/0.3/crypto/openssl/UP_TRIGGERS#2 (xtext) ====
@@ -3,7 +3,7 @@
local OLD_SPELL_VERSION=""
spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
if [ "${VERSION/[a-z]*/}" != "${OLD_SPELL_VERSION/[a-z]*/}" ]; then
- for each in $(gaze depends $SPELL 1|cut -f1 -d:); do
+ for each in $(fast_up_depends $SPELL 1); do
up_trigger $each cast_self
done
fi
==== //sgl/grimoires/stable/0.3/perl-cpan/perl/HISTORY#2 (text) ====
@@ -1,3 +1,7 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz at gmx.net>
+ * UP_TRIGGERS: replaced 'gaze depends' call with
+ fast_up_depends, bug #10661
+
2005-09-23 Arwed v. Merkatz <v.merkatz at gmx.net>
* UP_TRIGGERS: added to cleanly recast all perl modules on a version
upgrade, meant to replace the rebuild_modules hack when sorcery 1.13
==== //sgl/grimoires/stable/0.3/perl-cpan/perl/UP_TRIGGERS#2 (xtext) ====
@@ -1,7 +1,7 @@
local OLD_SPELL_VERSION=""
spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
if [ "$VERSION" != "$OLD_SPELL_VERSION" ]; then
- for name in $(gaze depends --fast perl); do
+ for name in $(fast_up_depends perl); do
if test -f $INSTALL_LOGS/$name-$(installed_version $name); then
if grep -q "$TRACK_ROOT/usr/lib/perl5.*\.pm$" \
$INSTALL_LOGS/$name-$(installed_version $name); then
==== //sgl/grimoires/stable/0.3/printer/cups/HISTORY#2 (text) ====
@@ -1,3 +1,7 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz at gmx.net>
+ * PRE_BUILD: replaced 'gaze depends' call with
+ fast_up_depends, bug #10661
+
2005-09-26 Jason Flatt <jflatt at sourcemage.org>
* BUILD, PRE_BUILD: Moved the Makefile patch code to PRE_BUILD.
* DETAILS, cups-1.1.23-source.tar.bz2.sig: Converted from MD5 to GPG.
==== //sgl/grimoires/stable/0.3/printer/cups/PRE_BUILD#2 (xtext) ====
@@ -2,11 +2,11 @@
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
- gaze depends gnulpr
+ fast_up_depends gnulpr
echo "gnulpr"
if query "Would you like to continue casting? " y; then
- for CASTED_SPELL in `gaze depends gnulpr`; do
+ 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
@@ -18,7 +18,7 @@
fi
else
if query "Would you like to continue casting? " y; then
- for CASTED_SPELL in `gaze depends gnulpr`; do
+ 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
==== //sgl/grimoires/stable/0.3/printer/gnulpr/HISTORY#2 (text) ====
@@ -1,3 +1,7 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz at gmx.net>
+ * PRE_BUILD: replaced 'gaze depends' call with
+ fast_up_depends, bug #10661
+
2004-11-22 Eric Sandall <eric at sandall.us>
* PRE_BUILD: Changed `exit` to `return 1` (Bug #7649)
==== //sgl/grimoires/stable/0.3/printer/gnulpr/PRE_BUILD#2 (xtext) ====
@@ -2,11 +2,11 @@
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
- gaze depends cups
+ fast_up_depends cups
echo "cups"
if query "Would you like to continue casting? " y; then
- for CASTED_SPELL in `gaze depends cups`; do
+ 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
@@ -18,7 +18,7 @@
fi
else
if query "Would you like to continue casting? " y; then
- for CASTED_SPELL in `gaze depends cups`; do
+ 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
More information about the SM-Commit
mailing list