Zac Medico (zmedico | 1 Apr 01:12 2008
Picon

portage r9654 - main/trunk/pym/_emerge

Author: zmedico
Date: 2008-03-31 23:12:14 +0000 (Mon, 31 Mar 2008)
New Revision: 9654

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
In the package selection loop, move the installed package rejection
code as early as possible.

Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-03-31 21:08:10 UTC (rev 9653)
+++ main/trunk/pym/_emerge/__init__.py	2008-03-31 23:12:14 UTC (rev 9654)
 <at>  <at>  -2572,6 +2572,11  <at>  <at> 
 			for db, pkg_type, built, installed, db_keys in dbs:
 				if existing_node:
 					break
+				if installed and not find_existing_node:
+					want_reinstall = empty or \
+						(found_available_arg and not selective)
+					if want_reinstall and matched_packages:
+						continue
 				if hasattr(db, "xmatch"):
 					cpv_list = db.xmatch("match-all", atom)
 				else:
 <at>  <at>  -2698,20 +2703,11  <at>  <at> 
 						pkgsettings.setcpv(cpv, mydb=metadata)
 						metadata["USE"] = pkgsettings["PORTAGE_USE"]
 						myeb = cpv
(Continue reading)

Zac Medico (zmedico | 1 Apr 01:14 2008
Picon

portage r9655 - main/branches/2.1.2/bin

Author: zmedico
Date: 2008-03-31 23:14:42 +0000 (Mon, 31 Mar 2008)
New Revision: 9655

Modified:
   main/branches/2.1.2/bin/emerge
Log:
In the package selection loop, move the installed package rejection
code as early as possible. (trunk r9654)

Modified: main/branches/2.1.2/bin/emerge
===================================================================
--- main/branches/2.1.2/bin/emerge	2008-03-31 23:12:14 UTC (rev 9654)
+++ main/branches/2.1.2/bin/emerge	2008-03-31 23:14:42 UTC (rev 9655)
 <at>  <at>  -2222,6 +2222,11  <at>  <at> 
 			for db, pkg_type, built, installed, db_keys in dbs:
 				if existing_node:
 					break
+				if installed and not find_existing_node:
+					want_reinstall = empty or \
+						(found_available_arg and not selective)
+					if want_reinstall and matched_packages:
+						continue
 				if hasattr(db, "xmatch"):
 					cpv_list = db.xmatch("match-all", atom)
 				else:
 <at>  <at>  -2345,20 +2350,11  <at>  <at> 
 						pkgsettings.setcpv(cpv, mydb=metadata)
 						metadata["USE"] = pkgsettings["PORTAGE_USE"]
 						myeb = cpv
(Continue reading)

Chris PeBenito (pebenito | 1 Apr 01:25 2008
Picon

gentoo-x86 commit in app-admin/setools: ChangeLog setools-3.3.4.ebuild

pebenito    08/03/31 23:25:49

  Modified:             ChangeLog
  Added:                setools-3.3.4.ebuild
  Log:
  app-admin/setools: Update with fixes for glibc 2.7, gcc 3.4, and tcl/tk 8.5.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.56                 app-admin/setools/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/setools/ChangeLog?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/setools/ChangeLog?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/setools/ChangeLog?r1=1.55&r2=1.56

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ChangeLog	26 Feb 2008 16:07:50 -0000	1.55
+++ ChangeLog	31 Mar 2008 23:25:48 -0000	1.56
 <at>  <at>  -1,6 +1,11  <at>  <at> 
 # ChangeLog for app-admin/setools
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.55 2008/02/26 16:07:50
pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.56 2008/03/31 23:25:48
pebenito Exp $
(Continue reading)

Petteri Raty (betelgeuse | 1 Apr 01:38 2008
Picon

gentoo-x86 commit in dev-java/commons-cli: ChangeLog commons-cli-1.1.ebuild

betelgeuse    08/03/31 23:38:14

  Modified:             ChangeLog
  Added:                commons-cli-1.1.ebuild
  Log:
  Version bump. Fixes bug #215609.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.35                 dev-java/commons-cli/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-cli/ChangeLog?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-cli/ChangeLog?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-cli/ChangeLog?r1=1.34&r2=1.35

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog	3 Aug 2007 15:30:33 -0000	1.34
+++ ChangeLog	31 Mar 2008 23:38:14 -0000	1.35
 <at>  <at>  -1,6 +1,12  <at>  <at> 
 # ChangeLog for dev-java/commons-cli
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.34 2007/08/03 15:30:33
betelgeuse Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.35 2008/03/31 23:38:14
(Continue reading)

Zac Medico (zmedico | 1 Apr 01:47 2008
Picon

portage r9656 - main/trunk/pym/_emerge

Author: zmedico
Date: 2008-03-31 23:47:50 +0000 (Mon, 31 Mar 2008)
New Revision: 9656

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
When deps are forced to be satisfied by installed packages due to masking
or unavailability, only tolerate it when the atom comes from either the
system or world set since otherwise it's a good idea to bail so that the
user can correct the problem.

Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-03-31 23:14:42 UTC (rev 9655)
+++ main/trunk/pym/_emerge/__init__.py	2008-03-31 23:47:50 UTC (rev 9656)
 <at>  <at>  -2270,12 +2270,17  <at>  <at> 
 						self._missing_args.append((arg, atom))
 						continue
 					if pkg.installed and "selective" not in self.myparams:
+						self._unsatisfied_deps_for_display.append(
+							((myroot, atom), {}))
 						# Previous behavior was to bail out in this case, but
 						# since the dep is satisfied by the installed package,
 						# it's more friendly to continue building the graph
-						# and just show a warning message.
-						self._unsatisfied_deps_for_display.append(
-							((myroot, atom), {}))
+						# and just show a warning message. Therefore, only bail
+						# out here if the atom is not from either the system or
(Continue reading)

Zac Medico (zmedico | 1 Apr 01:53 2008
Picon

portage r9657 - main/branches/2.1.2/bin

Author: zmedico
Date: 2008-03-31 23:53:14 +0000 (Mon, 31 Mar 2008)
New Revision: 9657

Modified:
   main/branches/2.1.2/bin/emerge
Log:
When deps are forced to be satisfied by installed packages due to masking
or unavailability, only tolerate it when the atom comes from either the
system or world set since otherwise it's a good idea to bail so that the
user can correct the problem. (trunk r9656)

Modified: main/branches/2.1.2/bin/emerge
===================================================================
--- main/branches/2.1.2/bin/emerge	2008-03-31 23:47:50 UTC (rev 9656)
+++ main/branches/2.1.2/bin/emerge	2008-03-31 23:53:14 UTC (rev 9657)
 <at>  <at>  -2076,12 +2076,9  <at>  <at> 
 					return False, myfavorites

 				if pkg.installed and "selective" not in self.myparams:
-					# Previous behavior was to bail out in this case, but
-					# since the dep is satisfied by the installed package,
-					# it's more friendly to continue building the graph
-					# and just show a warning message.
 					self._unsatisfied_deps_for_display.append(
 						((myroot, myatom), {"myparent":None}))
+					return 0, myfavorites

 				try:
 					self.mysd = self.create(pkg, None)
(Continue reading)

Zac Medico (zmedico | 1 Apr 02:33 2008
Picon

portage r9658 - main/trunk/pym/portage

Author: zmedico
Date: 2008-04-01 00:33:35 +0000 (Tue, 01 Apr 2008)
New Revision: 9658

Modified:
   main/trunk/pym/portage/__init__.py
Log:
Bug #215308 - Cache the paths of known bad manifests to ensure that the
same broken manifest is never checked twice.

Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py	2008-03-31 23:53:14 UTC (rev 9657)
+++ main/trunk/pym/portage/__init__.py	2008-04-01 00:33:35 UTC (rev 9658)
 <at>  <at>  -4305,6 +4305,7  <at>  <at> 

 _doebuild_manifest_exempt_depend = 0
 _doebuild_manifest_checked = None
+_doebuild_broken_manifests = set()

 def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 	fetchonly=0, cleanup=0, dbkey=None, use_cache=1, fetchall=0, tree=None,
 <at>  <at>  -4413,13 +4414,16  <at>  <at> 
 		# Always verify the ebuild checksums before executing it.
 		pkgdir = os.path.dirname(myebuild)
 		manifest_path = os.path.join(pkgdir, "Manifest")
-		global _doebuild_manifest_checked
+		global _doebuild_manifest_checked, _doebuild_broken_manifests
+		if manifest_path in _doebuild_broken_manifests:
+			return 1
(Continue reading)

Zac Medico (zmedico | 1 Apr 02:36 2008
Picon

portage r9659 - main/branches/2.1.2/pym

Author: zmedico
Date: 2008-04-01 00:36:52 +0000 (Tue, 01 Apr 2008)
New Revision: 9659

Modified:
   main/branches/2.1.2/pym/portage.py
Log:
Bug #215308 - Cache the paths of known bad manifests to ensure that the
same broken manifest is never checked twice. (trunk r9658)

Modified: main/branches/2.1.2/pym/portage.py
===================================================================
--- main/branches/2.1.2/pym/portage.py	2008-04-01 00:33:35 UTC (rev 9658)
+++ main/branches/2.1.2/pym/portage.py	2008-04-01 00:36:52 UTC (rev 9659)
 <at>  <at>  -4280,6 +4280,7  <at>  <at> 

 _doebuild_manifest_exempt_depend = 0
 _doebuild_manifest_checked = None
+_doebuild_broken_manifests = set()

 def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 	fetchonly=0, cleanup=0, dbkey=None, use_cache=1, fetchall=0, tree=None,
 <at>  <at>  -4388,13 +4389,16  <at>  <at> 
 		# Always verify the ebuild checksums before executing it.
 		pkgdir = os.path.dirname(myebuild)
 		manifest_path = os.path.join(pkgdir, "Manifest")
-		global _doebuild_manifest_checked
+		global _doebuild_manifest_checked, _doebuild_broken_manifests
+		if manifest_path in _doebuild_broken_manifests:
+			return 1
(Continue reading)

Jeroen Roovers (jer | 1 Apr 03:06 2008
Picon

gentoo-x86 commit in x11-misc/xscreensaver: ChangeLog xscreensaver-5.05.ebuild

jer         08/04/01 01:06:02

  Modified:             ChangeLog xscreensaver-5.05.ebuild
  Log:
  Stable for HPPA (bug #214870).
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.230                x11-misc/xscreensaver/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/ChangeLog?rev=1.230&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/ChangeLog?rev=1.230&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/ChangeLog?r1=1.229&r2=1.230

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- ChangeLog	30 Mar 2008 23:37:06 -0000	1.229
+++ ChangeLog	1 Apr 2008 01:06:02 -0000	1.230
 <at>  <at>  -1,6 +1,9  <at>  <at> 
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.229 2008/03/30 23:37:06
ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.230 2008/04/01 01:06:02
jer Exp $
+
(Continue reading)

Christoph Mende (angelos | 1 Apr 03:42 2008
Picon

gentoo-x86 commit in xfce-extra/xfmpc: - New directory

angelos     08/04/01 01:42:17

  Log:
  Directory /var/cvsroot/gentoo-x86/xfce-extra/xfmpc added to the repository
--

-- 
gentoo-commits@... mailing list


Gmane