OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Feb-2004 14:52:48
Branch: OPENPKG_2_0_SOLID Handle: 2004022013524700
Modified files: (Branch: OPENPKG_2_0_SOLID)
openpkg-src/openpkg aux.wrapbin.sh openpkg.boot openpkg.sh rpmdb
Log:
MFC: cleanup displayed messages and do not display error message on
failed commands
Summary:
Revision Changes Path
1.17.2.1 +10 -8 openpkg-src/openpkg/aux.wrapbin.sh
1.48.2.1 +17 -16 openpkg-src/openpkg/openpkg.boot
1.3.2.2 +2 -11 openpkg-src/openpkg/openpkg.sh
1.4.2.1 +2 -2 openpkg-src/openpkg/rpmdb
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/aux.wrapbin.sh
============================================================================
$ cvs diff -u -r1.17 -r1.17.2.1 aux.wrapbin.sh
--- openpkg-src/openpkg/aux.wrapbin.sh 17 Feb 2004 19:53:36 -0000 1.17
+++ openpkg-src/openpkg/aux.wrapbin.sh 20 Feb 2004 13:52:47 -0000
1.17.2.1
@@ -207,19 +207,21 @@
echo "under prefix ${l_prefix} on target platform ${l_platform}."
echo ""
echo "Details about this installed OpenPKG instance you can easily"
- echo "determine by running the following typical RPM query commands:"
+ echo "determine by running the following typical OpenPKG RPM query"
+ echo "commands:"
echo ""
echo " \$ ${l_prefix}/bin/openpkg rpm -qa"
echo " \$ ${l_prefix}/bin/openpkg rpm -qi openpkg"
echo " \$ ${l_prefix}/bin/openpkg rpm -qlv openpkg"
echo ""
echo "The integrity of the whole OpenPKG instance you can check at any"
- echo "time by running the RPM verify command:"
+ echo "time by running the OpenPKG RPM verify command:"
echo ""
echo " \$ ${l_prefix}/bin/openpkg rpm -Va"
echo ""
- echo "For installing software packages into this OpenPKG instance, just run"
- echo "the following two RPM build commands for each package:"
+ echo "For installing software packages into this OpenPKG instance,"
+ echo "just run the following two OpenPKG RPM build commands for each"
+ echo "package:"
echo ""
echo " \$ ${l_prefix}/bin/openpkg rpm --rebuild /path/to/foo-*.src.rpm"
echo " \$ ${l_prefix}/bin/openpkg rpm -Uvh ${l_prefix}/RPM/PKG/foo-*.rpm"
@@ -228,10 +230,10 @@
echo ""
echo " \$ ${l_prefix}/bin/openpkg rpm -e foo"
echo ""
- echo "For removing the whole OpenPKG instance under prefix ${l_prefix},"
- echo "just remove every package. Once you finally removed the package"
- echo "\"openpkg\", the whole OpenPKG instance will be unlinked from the"
- echo "system and removed, too."
+ echo "For removing the whole OpenPKG instance under prefix"
+ echo "${l_prefix}, just remove every package. Once you finally"
+ echo "removed the package \"openpkg\", the whole OpenPKG instance"
+ echo "will be unlinked from the system and removed, too."
echo ""
echo "Thank you for flying OpenPKG..."
echo " Ralf S. Engelschall"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.boot
============================================================================
$ cvs diff -u -r1.48 -r1.48.2.1 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 16 Feb 2004 21:06:51 -0000 1.48
+++ openpkg-src/openpkg/openpkg.boot 20 Feb 2004 13:52:47 -0000 1.48.2.1
@@ -632,7 +632,7 @@
echo "++ resulting OpenPKG bootstrap package files:"
(cd $dstdir; ls -l openpkg-$v.$t.sh openpkg-$v.$t.rpm openpkg-$v.src.rpm)
set +x
-( echo "You have successfully built the OpenPKG bootstrap packages from scratch"
+( echo "You have successfully built the OpenPKG Package from scratch"
echo "for prefix $prefix on target platform $l_platform. The input"
echo "was the OpenPKG Source Bootstrap Package in file:"
echo ""
@@ -644,23 +644,24 @@
echo " openpkg-$v.$t.rpm"
echo " openpkg-$v.$t.sh"
echo ""
- echo "The first result file is the OpenPKG Source Package, containing just"
- echo "the same contents than the OpenPKG Source Bootstrap Package, but now in"
- echo "RPM format. Optionally use this after the installation of the OpenPKG"
- echo "Binary Bootstrap Package if you want to rebuild from source again (but"
- echo "then with RPM available)."
- echo ""
- echo "The second result file is the OpenPKG Binary Package, containing the"
- echo "installation files in RPM format for the OpenPKG instance $prefix."
- echo "Optionally use this after the installation of the OpenPKG Binary"
- echo "Bootstrap Package if you want (usually for fixing something) to"
- echo "reinstall (but then with RPM available)."
+ echo "The first result file is the OpenPKG Source RPM Package,"
+ echo "containing just the same contents than the OpenPKG Source"
+ echo "Bootstrap Package, but now in RPM format. Optionally use this"
+ echo "after the installation of the OpenPKG Binary Bootstrap Package"
+ echo "if you want to rebuild from source again (but then with RPM"
+ echo "available)."
+ echo ""
+ echo "The second result file is the OpenPKG Binary RPM Package,"
+ echo "containing the installation files in RPM format for the OpenPKG"
+ echo "instance $prefix. Optionally use this after the installation of"
+ echo "the OpenPKG Binary Bootstrap Package if you want (usually for"
+ echo "fixing something) to reinstall (but then with RPM available)."
echo ""
echo "The third result file is the OpenPKG Binary Bootstrap Package,"
- echo "containing the installation files as a self-extracting shell script for"
- echo "the OpenPKG instance $prefix. Use this in YOUR NEXT STEP to initially"
- echo "create the OpenPKG instance from scratch. Hence, proceed now by running"
- echo "the following command:"
+ echo "containing the installation files as a self-extracting shell"
+ echo "script for the OpenPKG instance $prefix. Use this in YOUR NEXT"
+ echo "STEP to initially create the OpenPKG instance from scratch."
+ echo "Hence, proceed now by running the following command:"
echo ""
echo " \$ sh openpkg-$v.$t.sh"
) | sh $tmpdir/rpmtool msg -b -t info
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.sh
============================================================================
$ cvs diff -u -r1.3.2.1 -r1.3.2.2 openpkg.sh
--- openpkg-src/openpkg/openpkg.sh 19 Feb 2004 16:49:32 -0000 1.3.2.1
+++ openpkg-src/openpkg/openpkg.sh 20 Feb 2004 13:52:47 -0000 1.3.2.2
@@ -239,15 +239,6 @@
exit 1
fi
-# execute command and save return code
-eval "$cmd_shell $cmd_path \${1+\"[EMAIL PROTECTED]"}"
-rc=$?
-
-# execution result check and graceful termination
-if [ $rc -ne 0 ]; then
- echo "openpkg:ERROR: Command \"$cmd\" failed (return code was $rc)" 1>&2
-fi
-
-# exit and pass cmd return code to caller
-exit $rc
+# execute command
+eval "exec $cmd_shell $cmd_path \${1+\"[EMAIL PROTECTED]"}"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmdb
============================================================================
$ cvs diff -u -r1.4 -r1.4.2.1 rpmdb
--- openpkg-src/openpkg/rpmdb 16 Feb 2004 21:06:51 -0000 1.4
+++ openpkg-src/openpkg/rpmdb 20 Feb 2004 13:52:47 -0000 1.4.2.1
@@ -317,9 +317,9 @@
# (we have no package available, but removing and reimporting
# the OpenPKG OpenPGP key is a harmless thing and always possible)
verbose 2 "performing read/write operation on RPM database"
- rpm -q gpg-pubkey-63c4cb9f-3c591eda >/dev/null && \
+ rpm -q gpg-pubkey-63c4cb9f-3c591eda >/dev/null 2>&1 && \
rpm -e gpg-pubkey-63c4cb9f-3c591eda --allmatches || true
- rpm -q gpg-pubkey-63c4cb9f-3c591eda >/dev/null || \
+ rpm -q gpg-pubkey-63c4cb9f-3c591eda >/dev/null 2>&1 || \
rpm --import $prefix/etc/openpkg/openpkg.pgp || true
rpm -qa >/dev/null 2>&1
}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
