RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Mark Hatle
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 03-Jan-2008 18:57:35
Branch: HEAD Handle: 2008010317573400
Modified files:
rpm CHANGES rpmqv.c
rpm/lib rpminstall.c
Log:
Submitted by: Wind River Systems
Reviewed by: jbj on IRC
- mgh: allow --ignoresize when doing an erase
Workaround for an issue where you may have slow or broken NFS mounts that
can hang an erase operation.
Summary:
Revision Changes Path
1.2052 +1 -0 rpm/CHANGES
1.189 +2 -1 rpm/lib/rpminstall.c
1.139 +0 -5 rpm/rpmqv.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2051 -r1.2052 CHANGES
--- rpm/CHANGES 3 Jan 2008 10:55:39 -0000 1.2051
+++ rpm/CHANGES 3 Jan 2008 17:57:34 -0000 1.2052
@@ -1,4 +1,5 @@
5.0b4 -> 5.0.0:
+ - mgh: allow --ignoresize when doing an erase
- rse: fix database configuration for recently added indices "Nvra" and
"Sourcepkgid"
- jbj: differentiate %warn and %error (now stops) behavior (from
openpkg).
- jbj: merge %{realpath:...}. won't hurt a thing (from openpkg).
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpminstall.c
============================================================================
$ cvs diff -u -r1.188 -r1.189 rpminstall.c
--- rpm/lib/rpminstall.c 8 Dec 2007 19:21:55 -0000 1.188
+++ rpm/lib/rpminstall.c 3 Jan 2008 17:57:34 -0000 1.189
@@ -625,7 +625,8 @@
/* Drop added/available package indices and dependency sets. */
rpmtsClean(ts);
- numPackages = rpmtsRun(ts, NULL, 0);
+ numPackages = rpmtsRun(ts, NULL,
+ ia->probFilter &
(RPMPROB_FILTER_DISKSPACE|RPMPROB_FILTER_DISKNODES));
ps = rpmtsProblems(ts);
if (rpmpsNumProblems(ps) > 0)
rpmpsPrint(NULL, ps);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmqv.c
============================================================================
$ cvs diff -u -r1.138 -r1.139 rpmqv.c
--- rpm/rpmqv.c 3 Jan 2008 09:01:32 -0000 1.138
+++ rpm/rpmqv.c 3 Jan 2008 17:57:34 -0000 1.139
@@ -608,11 +608,6 @@
argerror(_("--ignoreos may only be specified during package "
"installation"));
- if (bigMode != MODE_INSTALL &&
- (ia->probFilter & (RPMPROB_FILTER_DISKSPACE|RPMPROB_FILTER_DISKNODES)))
- argerror(_("--ignoresize may only be specified during package "
- "installation"));
-
if ((ia->installInterfaceFlags & INSTALL_ALLMATCHES) && bigMode !=
MODE_ERASE)
argerror(_("--allmatches may only be specified during package "
"erasure"));
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
