- python: initdb binding (Dan Burcaw <dburcaw@terraplex.com>).

- internalize --freshen (Gordon Messmer <yinyang@eburg.com>).

CVS patchset: 3905
CVS date: 2000/06/23 00:49:43

3 files changed, 4 insertions, 56 deletions

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 163a2ba4c..8cdc6c97a 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST = \
 	brp-compress brp-redhat brp-strip brp-strip-comment-note \
 	brp-sparc64-linux check-prereqs convertrpmrc.sh find-lang.sh \
 	find-prov.pl find-req.pl cpanflute find-provides.perl \
-	find-requires.perl freshen.sh get_magic.pl getpo.sh http.req \
+	find-requires.perl get_magic.pl getpo.sh http.req \
 	magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh \
 	vpkg-provides.sh vpkg-provides2.sh
 
@@ -19,6 +19,6 @@ config_SCRIPTS = \
 	brp-compress brp-redhat brp-strip brp-strip-comment-note \
 	brp-sparc64-linux check-prereqs convertrpmrc.sh find-lang.sh \
 	find-prov.pl find-req.pl cpanflute find-provides.perl \
-	find-requires.perl freshen.sh get_magic.pl getpo.sh http.req \
+	find-requires.perl get_magic.pl getpo.sh http.req \
 	magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh \
 	vpkg-provides.sh vpkg-provides2.sh
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 0787ca2f0..38ffbde14 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -164,13 +164,13 @@ varprefix = @varprefix@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
-EXTRA_DIST =  	brp-compress brp-redhat brp-strip brp-strip-comment-note 	brp-sparc64-linux check-prereqs convertrpmrc.sh find-lang.sh 	find-prov.pl find-req.pl cpanflute find-provides.perl 	find-requires.perl freshen.sh get_magic.pl getpo.sh http.req 	magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh 	vpkg-provides.sh vpkg-provides2.sh
+EXTRA_DIST =  	brp-compress brp-redhat brp-strip brp-strip-comment-note 	brp-sparc64-linux check-prereqs convertrpmrc.sh find-lang.sh 	find-prov.pl find-req.pl cpanflute find-provides.perl 	find-requires.perl get_magic.pl getpo.sh http.req 	magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh 	vpkg-provides.sh vpkg-provides2.sh
 
 
 installprefix = $(DESTDIR)
 
 configdir = ${prefix}/lib/rpm
-config_SCRIPTS =  	brp-compress brp-redhat brp-strip brp-strip-comment-note 	brp-sparc64-linux check-prereqs convertrpmrc.sh find-lang.sh 	find-prov.pl find-req.pl cpanflute find-provides.perl 	find-requires.perl freshen.sh get_magic.pl getpo.sh http.req 	magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh 	vpkg-provides.sh vpkg-provides2.sh
+config_SCRIPTS =  	brp-compress brp-redhat brp-strip brp-strip-comment-note 	brp-sparc64-linux check-prereqs convertrpmrc.sh find-lang.sh 	find-prov.pl find-req.pl cpanflute find-provides.perl 	find-requires.perl get_magic.pl getpo.sh http.req 	magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh 	vpkg-provides.sh vpkg-provides2.sh
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
diff --git a/scripts/freshen.sh b/scripts/freshen.sh
deleted file mode 100755
index ef473ed92..000000000
--- a/scripts/freshen.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-# Implements --freshen option in RPM. --freshen is mostly like upgrade, but
-# go through each file and make sure the package is actually installed before
-# upgrading it. This won't work properly if there are any odd options
-# specified (i.e. filenames with " specified). I'm sure some shell-hacker
-# out there can fix that <hint, hint>.
-
-case `basename $0` in
-rpme|rpmi|rpmu)	rpm="$0" ;;
-*)		rpm="`dirname $0`/rpmi" ;;
-esac
-shift
-
-args="-U"
-while [ $# -gt 0 ]; do
-    if [ "$1" = "--" ]; then
-	break
-    fi
-    args="$args $1"
-    shift
-done
-
-if [ $# = 0 ]; then
-    exec $RPM $args
-fi
-
-origargs="$args"
-args="$args -- "
-shift
-
-# Just filenames left now
-for n in $*; do
-    # if the file doesn't exist, we'll let RPM give the error message
-    if [ ! -f $n ]; then
-	args="$args $n"
-    else
-	if rpm -q `rpm -qp $n` >/dev/null 2>&1
-	then
-	    :
-	else
-	    name=`rpm --qf "%{NAME}" -qp $n`
-	    $RPM -q $name >/dev/null 2>&1 && args="$args $n"
-	fi
-    fi
-done
-
-if [ "$args" = "$origargs -- " ]; then
-    echo no packages require freshening
-else
-    exec $RPM $args
-fi