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: 30-Dec-2009 01:58:15
Branch: HEAD Handle: 2009123000581401
Modified files:
rpm CHANGES
rpm/perl/t 05.packageiterator.t
Log:
- perl: change --macros to point to ../macros/macros now.
Summary:
Revision Changes Path
1.3225 +1 -0 rpm/CHANGES
1.4 +3 -3 rpm/perl/t/05.packageiterator.t
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3224 -r1.3225 CHANGES
--- rpm/CHANGES 29 Dec 2009 22:34:54 -0000 1.3224
+++ rpm/CHANGES 30 Dec 2009 00:58:14 -0000 1.3225
@@ -1,5 +1,6 @@
5.2b1 -> 5.3a1
+ - jbj: perl: change --macros to point to ../macros/macros now.
- jbj: verify: fix: no parent txn running %verifyscript/%sanitycheck.
- jbj: rpmfi: fix: memory leak running %pretrans.
- jbj: rpmdb: fix: add proper rc for RPMTAG_FILEPATHS w no files.
@@ .
patch -p0 <<'@@ .'
Index: rpm/perl/t/05.packageiterator.t
============================================================================
$ cvs diff -u -r1.3 -r1.4 05.packageiterator.t
--- rpm/perl/t/05.packageiterator.t 14 Aug 2007 16:36:47 -0000 1.3
+++ rpm/perl/t/05.packageiterator.t 30 Dec 2009 00:58:15 -0000 1.4
@@ -22,11 +22,11 @@
# Creating temp db
mkdir($tempdbpath) or die "Cannot create $tempdbpath";
-my @rpmcmd = (qw(../rpm --macros ../macros --define), "_dbpath $tempdbpath",
'--initdb');
+my @rpmcmd = (qw(../rpm --macros ../macros/macros --define), "_dbpath
$tempdbpath", '-qa');
system(@rpmcmd) and die "Cannot init db in $tempdbpath";
-system(qw(../rpm --macros ../macros), '--define', "_dbpath $tempdbpath",
qw(-U test-rpm-1.0-1.noarch.rpm --justdb --nodeps));
+system(qw(../rpm --macros ../macros/macros), '--define', "_dbpath
$tempdbpath", qw(-U test-rpm-1.0-1.noarch.rpm --justdb --nodeps));
-RPM::load_macro_file('../macros');
+RPM::load_macro_file('../macros/macros');
RPM::add_macro("_dbpath $tempdbpath");
use_ok('RPM::PackageIterator');
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
