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:29:40
Branch: rpm-5_4 Handle: 2012031721294000
Modified files: (Branch: rpm-5_4)
rpm/tests dir2symlink-1-1.src.rpm dir2symlink.spec
Log:
- tests: fix: DIR -> SYMLINK in ruby improvements.
Summary:
Revision Changes Path
1.1.2.3 BLOB rpm/tests/dir2symlink-1-1.src.rpm
1.1.2.3 +7 -10 rpm/tests/dir2symlink.spec
____________________________________________________________________________
(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.2 -r1.1.2.3 dir2symlink.spec
--- rpm/tests/dir2symlink.spec 17 Mar 2012 21:00:11 -0000 1.1.2.2
+++ rpm/tests/dir2symlink.spec 17 Mar 2012 21:29:40 -0000 1.1.2.3
@@ -122,34 +122,32 @@
%if 1
%post -n dir2symlink-ruby-1 -p <ruby>
#XXX no output displayed by <ruby>
-print "--- post(ruby) arg " + ARGV[0] + " ..."
-print "Create a /tmp/ruby.d directory."
+$stderr.puts "--- post(ruby) arg " + ARGV[0] + " ..."
+$stderr.puts "Create a /tmp/ruby.d directory."
%preun -n dir2symlink-ruby-2 -p <ruby>
#XXX no output displayed by <ruby>
-print "--- preun(ruby) arg " + ARGV[0] + " ..."
-if ARGV[0] <= 1
- print "Undo the DIR -> SYMLINK change."
+$stderr.puts "--- preun(ruby) arg " + ARGV[0] + " ..."
+if Integer(ARGV[0]) <= 1
+ $stderr.puts "Undo the DIR -> SYMLINK change."
File::unlink("/tmp/ruby.d")
File::rename("/tmp/.ruby.d", "/tmp/ruby.d")
end
%pretrans -n dir2symlink-ruby-2 -p <ruby>
#XXX no output displayed by <ruby>
-print "--- pretrans(ruby) arg " + ARGV[0] + " ..."
-print "Rename DIR.d -> .DIR.d and create SYMLINK .DIR.d <- DIR.d."
+$stderr.puts "--- pretrans(ruby) arg " + ARGV[0] + " ..."
+$stderr.puts "Rename DIR.d -> .DIR.d and create SYMLINK .DIR.d <- DIR.d."
File::rename("/tmp/ruby.d", "/tmp/.ruby.d")
File::symlink("/tmp/.ruby.d", "/tmp/ruby.d")
%endif
%if 1
%post -n dir2symlink-tcl-1 -p <tcl>
-#XXX no output displayed by <tcl>
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 stderr "--- preun(tcl) arg [lindex $argv 0] ..."
if { [lindex $argv 0] <= 1 } {
puts stderr "Undo the DIR -> SYMLINK change."
@@ -158,7 +156,6 @@
}
%pretrans -n dir2symlink-tcl-2 -p <tcl>
-#XXX no output displayed by <tcl>
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
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
