rpms/yum/devel yum-HEAD.patch,1.54,1.55 yum.spec,1.315,1.316

Wed May 5 06:49:31 UTC 2010

Author: james

Update of /cvs/pkgs/rpms/yum/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9667

Modified Files:
	yum-HEAD.patch yum.spec 
Log Message:
* Wed May  5 2010 James Antill <james at fedoraproject.org> - 3.2.27-11
- Fix from head for mock, mtime=>ctime due to caches and fixed installroot
- Fix for typo in new problems code, bug 589008


yum-HEAD.patch:
 b/Makefile                |    2 
 b/cli.py                  |  137 +++
 b/docs/yum.8              |   49 +
 b/docs/yum.conf.5         |   45 +
 b/etc/Makefile            |    2 
 b/etc/yum.bash            |   19 
 b/output.py               |   67 +
 b/po/fi.po                |  203 ++---
 b/po/pt_BR.po             | 1723 ++++++++++++++++++++++++++--------------------
 b/po/ru.po                |  783 ++++++++++----------
 b/rpmUtils/miscutils.py   |   44 -
 b/rpmUtils/oldUtils.py    |    2 
 b/rpmUtils/transaction.py |    7 
 b/rpmUtils/updates.py     |   53 -
 b/test/depsolvetests.py   |   15 
 b/test/testbase.py        |   13 
 b/test/yum-leak-test.py   |   96 ++
 b/test/yum-pylintrc       |    3 
 b/utils.py                |    6 
 b/yum-updatesd.py         |    8 
 b/yum.spec                |   26 
 b/yum/__init__.py         |  232 ++++--
 b/yum/comps.py            |   21 
 b/yum/config.py           |   76 +-
 b/yum/depsolve.py         |  106 ++
 b/yum/history.py          |   41 -
 b/yum/logginglevels.py    |   44 -
 b/yum/mdparser.py         |    2 
 b/yum/misc.py             |   34 
 b/yum/packageSack.py      |   69 +
 b/yum/packages.py         |  129 ++-
 b/yum/pgpmsg.py           |   19 
 b/yum/pkgtag_db.py        |    4 
 b/yum/repoMDObject.py     |   94 ++
 b/yum/repos.py            |    2 
 b/yum/rpmsack.py          |  121 ++-
 b/yum/sqlitesack.py       |   85 +-
 b/yum/transactioninfo.py  |   51 +
 b/yum/update_md.py        |   10 
 b/yum/yumRepo.py          |   28 
 b/yumcommands.py          |   31 
 yum/__init__.py           |    2 
 yum/rpmsack.py            |    6 
 43 files changed, 2972 insertions(+), 1538 deletions(-)

Index: yum-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum-HEAD.patch,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55

--- yum-HEAD.patch	3 May 2010 15:42:21 -0000	1.54
+++ yum-HEAD.patch	5 May 2010 06:49:29 -0000	1.55
@@ -10477,3 +10477,54 @@ index 35bd97c..89c562c 100644
              rc = 1
          return rc, ['%s %s' % (basecmd, chkcmd)]
  
+commit a079025ebb241849ba734b47607af9eb0c2ae9a3
+Author: James Antill <james at and.org>
+Date:   Wed May 5 02:09:58 2010 -0400
+
+     Work around mock setting mtime on var/lib/Packages, for it's "caches".
+    Somehow the Packages file gets out of sync. with yum's cache/installed
+    in the mock installroot cache, but due to the mtime check we don't see
+    it and thus. blow up.
+     This does mean we'll blow the cache for normal use whenever ctime
+    changes now ... but hopefully that shouldn't be much more often.
+    
+     We are only hitting this now due to the installroot fixes that just
+    went in.
+
+diff --git a/yum/rpmsack.py b/yum/rpmsack.py
+index 6a40939..b457cc9 100644
+--- a/yum/rpmsack.py
++++ b/yum/rpmsack.py
+@@ -847,9 +847,11 @@ class RPMDBPackageSack(PackageSackBase):
+         rpmdbfname  = self.root + "/var/lib/rpm/Packages"
+ 
+         if os.path.exists(rpmdbvfname) and os.path.exists(rpmdbfname):
+-            # See if rpmdb has "changed" ...
++            #  See if rpmdb has "changed" ... NOTE that we need to use ctime
++            # due to mock, because it will save and restore arbitrary rpmdb's
++            # on us and will helpfully reset the mtime!
+             nmtime = os.path.getmtime(rpmdbvfname)
+-            omtime = os.path.getmtime(rpmdbfname)
++            omtime = os.path.getctime(rpmdbfname)
+             if omtime <= nmtime:
+                 rpmdbv = open(rpmdbvfname).readline()[:-1]
+                 self._have_cached_rpmdbv_data  = rpmdbv
+commit bc35eef42e9743d4df152b8c5dbbe875546f2b71
+Author: James Antill <james at and.org>
+Date:   Wed May 5 02:45:03 2010 -0400
+
+    Parameter was conflicts, the variable passed was called res ... typo fix
+
+diff --git a/yum/__init__.py b/yum/__init__.py
+index eb135f4..c2313a0 100644
+--- a/yum/__init__.py
++++ b/yum/__init__.py
+@@ -1209,7 +1209,7 @@ class YumBase(depsolve.Depsolve):
+                     continue
+                 if prob.problem == 'conflicts':
+                     found = True # all the conflicting pkgs have to be ignored
+-                    for res in prob.res:
++                    for res in prob.conflicts:
+                         if res.pkgtup not in ignore_pkgtups:
+                             found = False
+                             break


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -p -r1.315 -r1.316
--- yum.spec	3 May 2010 15:42:23 -0000	1.315
+++ yum.spec	5 May 2010 06:49:31 -0000	1.316
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.27
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -132,6 +132,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Wed May  5 2010 James Antill <james at fedoraproject.org> - 3.2.27-11
+- Fix from head for mock, mtime=>ctime due to caches and fixed installroot
+- Fix for typo in new problems code, bug 589008
+
 * Mon May  3 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.27-10
 - latest head
 - fixes yum chroot path duplication

