aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-06-18 01:01:35 +0000
committerMike Frysinger <vapier@gentoo.org>2005-06-18 01:01:35 +0000
commit9dcd7f29a396103523739171e4dfe8ec24cc98f5 (patch)
treecac7d036214465c39696da8f0986d840250b024e
parentremove reference to non-existant profiles/use.mask (diff)
downloadportage-cvs-9dcd7f29a396103523739171e4dfe8ec24cc98f5.tar.gz
portage-cvs-9dcd7f29a396103523739171e4dfe8ec24cc98f5.tar.bz2
portage-cvs-9dcd7f29a396103523739171e4dfe8ec24cc98f5.zip
report exit status if gpg failed
-rw-r--r--ChangeLog5
-rwxr-xr-xbin/repoman4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 884abcb..168db1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for Portage; the Gentoo Linux ports system
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.990 2005/06/14 14:53:05 genone Exp $
+# $Id: ChangeLog,v 1.991 2005/06/18 01:01:35 vapier 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.
+ 17 Jun 2005; Mike Frysinger <vapier@gentoo.org> bin/repoman:
+ Report exit status if gpg failed to return with 0.
+
14 Jun 2005; Marius Mauch <genone@gentoo.org> man/portage.5:
Remove references to non-existant $PORTDIR/profiles/use.mask.
diff --git a/bin/repoman b/bin/repoman
index 4750785..d9f0023 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1,7 +1,7 @@
#!/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/repoman,v 1.111 2005/03/07 04:14:36 ferringb Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/repoman,v 1.112 2005/06/18 01:01:35 vapier Exp $
# Next to do: dep syntax checking in mask files
# Then, check to make sure deps are satisfiable (to avoid "can't find match for" problems)
@@ -1388,6 +1388,8 @@ else:
rValue = os.system(gpgcmd+" "+filename)
if rValue == 0:
os.rename(filename+".asc", filename)
+ else:
+ print "!!! gpg exited with '" + str(rValue) + "' status"
return rValue
mychanges=[]