[CVS] RPM: rpm-5_4: rpm/tests/ dir2symlink-1-1.src.rpm dir2symlink.spe...
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: 22-Mar-2012 00:41:05
Branch: rpm-5_4 Handle: 2012032123410401
Modified files: (Branch: rpm-5_4)
rpm/tests dir2symlink-1-1.src.rpm dir2symlink.spec
Log:
- tests: perl print STDERR and $ARGV[0] is the "1st argument".
- tests: python scriptlet syntax errors fixed.
Summary:
RevisionChanges Path
1.1.2.4 BLOBrpm/tests/dir2symlink-1-1.src.rpm
1.1.2.4 +14 -15 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.3 -r1.1.2.4 dir2symlink.spec
--- rpm/tests/dir2symlink.spec17 Mar 2012 21:29:40 - 1.1.2.3
+++ rpm/tests/dir2symlink.spec21 Mar 2012 23:41:04 - 1.1.2.4
@@ -79,42 +79,41 @@
%if 1
%post -n dir2symlink-python-1-p
-#XXX attempts to import rpm-python and so is host os dependent
-print "--- post(python) arg", sys.argv[1], "..."
-print "Create a /tmp/python.d directory."
+sys.stderr.write("--- post(python) arg " + sys.argv[1] + " ...\n")
+sys.stderr.write("Create a /tmp/python.d directory.\n")
%preun -n dir2symlink-python-2 -p
-print "--- preun(python) arg", sys.argv[1], "..."
+sys.stderr.write("--- preun(python) arg " + sys.argv[1] + " ...\n")
import os
-if argv[1] <= 1:
- print "Undo the DIR -> SYMLINK change."
+if sys.argv[1] <= 1:
+ sys.stderr.write("Undo the DIR -> SYMLINK change.\n")
os.unlink("/tmp/python.d")
os.rename("/tmp/.python.d", "/tmp/python.d")
%pretrans -n dir2symlink-python-2-p
-print "--- pretrans(python) arg", sys.argv[1], " ..."
+sys.stderr.write("--- pretrans(python) arg" + sys.argv[1] + " ...\n")
import os
-print "Rename DIR.d -> .DIR.d and create SYMLINK .DIR.d <- DIR.d."
+sys.stderr.write("Rename DIR.d -> .DIR.d and create SYMLINK .DIR.d <-
DIR.d.\n")
os.rename("/tmp/python.d", "/tmp/.python.d")
os.symlink("/tmp/.python.d", "/tmp/python.d")
%endif
%if 1
%post -n dir2symlink-perl-1 -p
-print "--- post(perl) arg " . $ARGV[1].. " ...";
-print "Create a /tmp/perl.d directory.";
+print STDERR "--- post(perl) arg " . $ARGV[0] . " ...\n";
+print STDERR "Create a /tmp/perl.d directory.\n";
%preun -n dir2symlink-perl-2 -p
-print "--- preun(perl) arg " . $ARGV[1] . " ...";
-if ($ARGV[1] <= 1) {
- print "Undo the DIR -> SYMLINK change.";
+print STDERR "--- preun(perl) arg " . $ARGV[0] . " ...\n";
+if ($ARGV[0] <= 1) {
+ print STDERR "Undo the DIR -> SYMLINK change.\n";
unlink("/tmp/perl.d");
rename("/tmp/.perl.d", "/tmp/perl.d");
}
%pretrans -n dir2symlink-perl-2 -p
-print "--- pretrans(perl) arg " . $ARGV[1] . " ...";
-print "Rename DIR.d -> .DIR.d and create SYMLINK .DIR.d <- DIR.d.";
+print STDERR "--- pretrans(perl) arg " . $ARGV[0] . " ...\n";
+print STDERR "Rename DIR.d -> .DIR.d and create SYMLINK .DIR.d <- DIR.d.\n";
rename("/tmp/perl.d", "/tmp/.perl.d");
symlink("/tmp/.perl.d", "/tmp/perl.d");
%endif
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/tests/ dir2symlink-1-1.src.rpm dir2symlink.spe...
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:
RevisionChanges Path
1.1.2.3 BLOBrpm/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.spec17 Mar 2012 21:00:11 - 1.1.2.2
+++ rpm/tests/dir2symlink.spec17 Mar 2012 21:29:40 - 1.1.2.3
@@ -122,34 +122,32 @@
%if 1
%post -n dir2symlink-ruby-1 -p
#XXX no output displayed by
-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
#XXX no output displayed by
-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
#XXX no output displayed by
-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
-#XXX no output displayed by
puts stderr "--- post(tcl) arg [lindex $argv 0] ..."
puts stderr "Create a /tmp/tcl.d directory."
%preun -n dir2symlink-tcl-2 -p
-#XXX no output displayed by
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
-#XXX no output displayed by
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 Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
