diff options
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/isolated-functions.sh | 3 | ||||
| -rwxr-xr-x | bin/repoman | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index bf11c0d4b..b743cefa0 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -1,4 +1,5 @@ -# Copyright 1999-2009 Gentoo Foundation +#!/bin/bash +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # We need this next line for "die" and "assert". It expands diff --git a/bin/repoman b/bin/repoman index ffc4c948b..a76bc8de5 100755 --- a/bin/repoman +++ b/bin/repoman @@ -68,10 +68,9 @@ import portage.checksum import portage.const import portage.dep portage.dep._dep_check_strict = True -import portage.exception from portage import cvstree, normalize_path from portage import util -from portage.exception import ParseError +from portage.exception import FileNotFound, ParseError, PermissionDenied from portage.manifest import Manifest from portage.process import find_binary, spawn from portage.output import bold, create_color_func, darkgreen, \ @@ -984,8 +983,12 @@ thirdpartymirrors = portage.flatten(list(repoman_settings.thirdpartymirrors().va try: herd_base = make_herd_base(os.path.join(repoman_settings["PORTDIR"], "metadata/herds.xml")) -except (EnvironmentError, ParseError) as e: +except (EnvironmentError, ParseError, PermissionDenied) as e: err(str(e)) +except FileNotFound: + # TODO: Download as we do for metadata.dtd, but add a way to + # disable for non-gentoo repoman users who may not have herds. + herd_base = None for x in scanlist: #ebuilds and digests added to cvs respectively. |