RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 17-Mar-2012 22:00:13
Branch: rpm-5_4 Handle: 2012031721001001
Modified files: (Branch: rpm-5_4)
rpm/tests Makefile.am dir2symlink-1-1.src.rpm
dir2symlink.spec
Log:
- tests: fix: DIR -> SYMLINK in tcl.
Summary:
Revision Changes Path
1.95.2.53 +1 -1 rpm/tests/Makefile.am
1.1.2.2 BLOB rpm/tests/dir2symlink-1-1.src.rpm
1.1.2.2 +11 -11 rpm/tests/dir2symlink.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.95.2.52 -r1.95.2.53 Makefile.am
--- rpm/tests/Makefile.am 17 Mar 2012 00:33:30 -0000 1.95.2.52
+++ rpm/tests/Makefile.am 17 Mar 2012 21:00:10 -0000 1.95.2.53
@@ -964,7 +964,7 @@
@-${rpm} -U lua-test/lua-test-*.noarch.rpm
@-${rpm} -e lua-test
-INTERPRETERS = lua perl # tcl ruby # python
+INTERPRETERS = lua perl tcl # ruby # python
check-dir2symlink:
@echo "=== $@ ==="
@-for i in ${INTERPRETERS}; do \
@@ .
(cd rpm/tests && \
uudecode <<'@@ .' && \
mv dir2symlink-1-1.src.rpm dir2symlink-1-1.src.rpm.orig && \
xdelta patch dir2symlink-1-1.src.rpm.xdelta dir2symlink-1-1.src.rpm.orig
dir2symlink-1-1.src.rpm && \
rm -f dir2symlink-1-1.src.rpm.orig dir2symlink-1-1.src.rpm.xdelta)
Index: rpm/tests/dir2symlink-1-1.src.rpm
============================================================================
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/dir2symlink.spec
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 dir2symlink.spec
--- rpm/tests/dir2symlink.spec 17 Mar 2012 00:23:27 -0000 1.1.2.1
+++ rpm/tests/dir2symlink.spec 17 Mar 2012 21:00:11 -0000 1.1.2.2
@@ -145,24 +145,24 @@
%if 1
%post -n dir2symlink-tcl-1 -p <tcl>
#XXX no output displayed by <tcl>
-puts "--- post(tcl) arg $argv[0] ..."
-puts "Create a /tmp/tcl.d directory."
+puts stderr "--- post(tcl) arg [lindex $argv 0] ..."
+puts stderr "Create a /tmp/tcl.d directory."
%preun -n dir2symlink-tcl-2 -p <tcl>
#XXX no output displayed by <tcl>
-puts "--- preun(tcl) arg $argv[0] ..."
-if { arg[2] <= 1 } {
- puts "Undo the DIR -> SYMLINK change."
- unlink /tmp/tcl.d
- rename /tmp/.tcl.d /tmp/tcl.d
+puts stderr "--- preun(tcl) arg [lindex $argv 0] ..."
+if { [lindex $argv 0] <= 1 } {
+ puts stderr "Undo the DIR -> SYMLINK change."
+ file delete /tmp/tcl.d
+ file rename /tmp/.tcl.d /tmp/tcl.d
}
%pretrans -n dir2symlink-tcl-2 -p <tcl>
#XXX no output displayed by <tcl>
-puts "--- pretrans(tcl) arg $argv[0] ..."
-puts "Rename DIR.d -> .DIR.d and create SYMLINK .DIR.d <- DIR.d."
-rename /tmp/tcl.d /tmp/.tcl.d
-file link -symbolic /tmp/.tcl.d /tmp/tcl.d
+puts stderr "--- pretrans(tcl) arg [lindex $argv 0] ..."
+puts stderr "Rename DIR.d -> .DIR.d and create SYMLINK .DIR.d <- DIR.d."
+file rename /tmp/tcl.d /tmp/.tcl.d
+file link -symbolic /tmp/tcl.d /tmp/.tcl.d
%endif
%if 1
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
