aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Stubbs <jstubbs@gentoo.org>2005-04-19 05:00:22 +0000
committerJason Stubbs <jstubbs@gentoo.org>2005-04-19 05:00:22 +0000
commitb20e7d4fcb054601dcda4e2cdff29130362b4c84 (patch)
tree3208faf1601fe687b9a5acca5620a52baab5c21e
parentpym/portage_exec.py: Added checks to see if the sandbox is executable and (diff)
downloadportage-cvs-b20e7d4fcb054601dcda4e2cdff29130362b4c84.tar.gz
portage-cvs-b20e7d4fcb054601dcda4e2cdff29130362b4c84.tar.bz2
portage-cvs-b20e7d4fcb054601dcda4e2cdff29130362b4c84.zip
bin/ebuild: Added a missing import of portage_util.
pym/portage.py: Fixed my assumption that ChangeLog and metadata.xml will exist during digest creation.
-rw-r--r--ChangeLog8
-rwxr-xr-xbin/ebuild4
-rw-r--r--pym/portage.py9
3 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index f33ad54..0278bba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,18 @@
# ChangeLog for Portage; the Gentoo Linux ports system
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.796.2.95 2005/04/17 09:01:54 jstubbs Exp $
+# $Id: ChangeLog,v 1.796.2.96 2005/04/19 05:00:22 jstubbs Exp $
MAJOR CHANGES in 2.0.51:
1. /var/cache/edb/virtuals is no longer used at all. It's calculated now.
2. /var/cache/edb/world is now /var/lib/portage/world.
3. /etc/portage/profile/virtuals is _USER_ configs only.
+ 19 Apr 2005; Jason Stubbs <jstubbs@gentoo.org> bin/ebuild: Added a missing
+ import of portage_util.
+
+ 19 Apr 2005; Jason Stubbs <jstubbs@gentoo.org> pym/portage.py: Fixed my
+ assumption that ChangeLog and metadata.xml will exist during digest creation.
+
17 Apr 2005; Brian Harring <ferringb@gentoo.org> pym/portage.py: eclass cache
touche up, mtime wasn't being properly checked (thanks to swegener for catching
it).
diff --git a/bin/ebuild b/bin/ebuild
index 86c2a8e..e0e3c78 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -1,9 +1,9 @@
#!/usr/bin/python -O
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild,v 1.18.2.1 2004/10/22 16:53:30 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild,v 1.18.2.2 2005/04/19 05:00:22 jstubbs Exp $
-import os,sys
+import os,sys,portage_util
sys.path = ["/usr/lib/portage/pym"]+sys.path
def getroot():
diff --git a/pym/portage.py b/pym/portage.py
index 2e255d5..35389d5 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1,10 +1,10 @@
# portage.py -- core Portage functionality
# Copyright 1998-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.56 2005/04/17 09:01:55 jstubbs Exp $
-cvs_id_string="$Id: portage.py,v 1.524.2.56 2005/04/17 09:01:55 jstubbs Exp $"[5:-2]
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.57 2005/04/19 05:00:22 jstubbs Exp $
+cvs_id_string="$Id: portage.py,v 1.524.2.57 2005/04/19 05:00:22 jstubbs Exp $"[5:-2]
-VERSION="$Revision: 1.524.2.56 $"[11:-2] + "-cvs"
+VERSION="$Revision: 1.524.2.57 $"[11:-2] + "-cvs"
# ===========================================================================
# START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
@@ -2088,7 +2088,8 @@ def digestgen(myarchives,mysettings,overwrite=1,manifestonly=0):
mypfiles=listdir(pbasedir,recursive=1,filesonly=1,ignorecvs=1,EmptyOnError=1)
mypfiles=cvstree.apply_cvsignore_filter(mypfiles)
for x in ["Manifest", "ChangeLog", "metadata.xml"]:
- mypfiles.remove(x)
+ if x in mypfiles:
+ mypfiles.remove(x)
mydigests=digestCreate(mypfiles, pbasedir)
if mydigests==None: # There was a problem, exit with an errorcode.