diff options
Diffstat (limited to 'src')
| -rwxr-xr-x[-rw-r--r--] | src/cpancheck.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/fedora-cert.py | 0 | ||||
| -rwxr-xr-x | src/fedora-cvs.py | 14 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/fedora-packager-setup.py | 12 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/fedora-qa | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/fedoradev-pkgowners | 18 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/getPackages.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/isutf8.sh | 0 |
8 files changed, 25 insertions, 19 deletions
diff --git a/src/cpancheck.sh b/src/cpancheck.sh index bc1b574..bc1b574 100644..100755 --- a/src/cpancheck.sh +++ b/src/cpancheck.sh diff --git a/src/fedora-cert.py b/src/fedora-cert.py index 8d8223f..8d8223f 100644..100755 --- a/src/fedora-cert.py +++ b/src/fedora-cert.py diff --git a/src/fedora-cvs.py b/src/fedora-cvs.py index 1d6efa7..42aa1c5 100755 --- a/src/fedora-cvs.py +++ b/src/fedora-cvs.py @@ -4,6 +4,7 @@ import commands import optparse import os import sys +from subprocess import * from OpenSSL import crypto @@ -44,14 +45,13 @@ def main(user, pkg_list): for module in pkg_list: print "Checking out %s from fedora CVS as %s:" % \ (module, user or "anonymous") + try: + retcode = call("%s /usr/bin/cvs co %s" % (cvs_env, module), shell=True) + if retcode < 0: + print >>sys.stderr, "CVS Checkout failed Error:", -retcode + except OSError, e: + print >>sys.stderr, "Execution failed:", e - retcode, output = commands.getstatusoutput("%s cvs co %s" % - (cvs_env, module)) - - if retcode != 0: - print "Error: %s" % (output,) - else: - print output if __name__ == '__main__': diff --git a/src/fedora-packager-setup.py b/src/fedora-packager-setup.py index a74d06b..1828b11 100644..100755 --- a/src/fedora-packager-setup.py +++ b/src/fedora-packager-setup.py @@ -103,13 +103,13 @@ def download_cert(location, file): def main(): user_home = os.path.expanduser('~') print 'Setting up Fedora packager environment' - user_cert = "%s/.fedora.cert" % user_home - upload_ca_cert = '%s/.fedora-upload-ca.cert' % user_home - server_ca_cert = '%s/.fedora-server-ca.cert' % user_home + user_cert = os.path.join(user_home, '.fedora.cert') + upload_ca_cert = os.path.join(user_home, '.fedora-upload-ca.cert') + server_ca_cert = os.path.join(user_home, '.fedora-server-ca.cert') if not os.path.isfile(user_cert): - print "You need a client certificate from the Fedora Account System" - print "Please download one from https://admin.fedoraproject.org/accounts/user/gencert" - print "Save it to ~/.fedora.cert and re-run this script" + print '''You need a client certificate from the Fedora Account System +Please download one from https://admin.fedoraproject.org/accounts/user/gencert +Save it to ~/.fedora.cert and re-run this script''' sys.exit(1) download_cert('https://admin.fedoraproject.org/accounts/fedora-server-ca.cert', server_ca_cert) if not os.path.islink(upload_ca_cert): diff --git a/src/fedora-qa b/src/fedora-qa index 857cfea..857cfea 100644..100755 --- a/src/fedora-qa +++ b/src/fedora-qa diff --git a/src/fedoradev-pkgowners b/src/fedoradev-pkgowners index c5d9f45..ada5753 100644..100755 --- a/src/fedoradev-pkgowners +++ b/src/fedoradev-pkgowners @@ -60,7 +60,7 @@ this_init() # check fasfile -- needs to be local, thus check first if [[ "${file_fadcsvdata}" ]]; then if [[ ! -s "${file_fadcsvdata}" ]]; then - echo "Could not find fas-datafile ${file_fadcsvdata}" >&2 + echo "Empty or nonexistent fas-datafile ${file_fadcsvdata}" >&2 exit 2 fi @@ -74,7 +74,7 @@ this_init() # pkgdb bugzilla data for owners if [[ "${file_pkgdbfiledata}" ]]; then if [[ ! -s "${file_pkgdbfiledata}" ]]; then - echo "Could not find pgkdb-datafile ${file_pkgdbfiledata}" >&2 + echo "Empty or nonexistent pkgdb-datafile ${file_pkgdbfiledata}" >&2 exit 2 fi else @@ -110,13 +110,19 @@ this_init() lookup_package() { local package_info="$(grep "${filter_for}|${1}|" "${file_pkgdbfiledata}")" - local owner="$(echo ${package_info} | cut -d '|' -f 4)" - if [[ ! "${owner}" ]]; then - # grep did not find anything or something else went wrong - echo "Could not find owner for ${1}" >&2 + if [[ ! "${package_info}" ]]; then + # grep did not find anything or something else went wrong, eg. + # https://fedorahosted.org/packagedb/ticket/138 + echo "Warning: could not find info for ${1}" >&2 return 1 fi + # owner? + local owner="$(echo ${package_info} | cut -d '|' -f 4)" + if [[ ! "${owner}" || "${owner}" == orphan ]]; then + # No owner, assume orphan + owner="(orphan)" + fi # co-maintainers? if [[ "${print_comaintainers}" ]]; then diff --git a/src/getPackages.sh b/src/getPackages.sh index 9bd9217..9bd9217 100644..100755 --- a/src/getPackages.sh +++ b/src/getPackages.sh diff --git a/src/isutf8.sh b/src/isutf8.sh index ad27650..ad27650 100644..100755 --- a/src/isutf8.sh +++ b/src/isutf8.sh |