Attachment 305059 Details for Bug 445995 – replace os.exit by sys.exit

[patch] replace os.exit by sys.exit

fedora-cvs.patch (text/plain), 1.42 KB, created by Ruben Kerkhof on 2008-05-11 11:49:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ruben Kerkhof

Created: 2008-05-11 11:49:56 UTC

Size: 1.42 KB

patch

obsolete

>--- /usr/bin/fedora-cvs.orig	2008-05-11 15:35:40.000000000 +0200
>+++ /usr/bin/fedora-cvs	2008-05-11 15:41:45.000000000 +0200
>@@ -1,7 +1,6 @@
> #!/usr/bin/python
> 
> import os
>-import string
> import sys
> import commands
> from OpenSSL import crypto
>@@ -10,11 +9,11 @@
>     ''' sample line "Subject: C=US, ST=North Carolina, O=Fedora Project, OU=Dennis Gilmore, CN=ausil/emailAddress=dennis@ausil.us" '''
>     userCert = ""
>     if os.access(os.path.join(os.path.expanduser('~'),".fedora.cert"), os.R_OK):
>-            userCert = open(os.path.join(os.path.expanduser('~'),".fedora.cert"), "r").read()
>+        userCert = open(os.path.join(os.path.expanduser('~'),".fedora.cert"), "r").read()
>     else:
>         print "!!!    cannot read your ~/.fedora.cert file   !!!"
>         print "!!! Ensure the file is readable and try again !!!"
>-        os.exit(1)
>+        sys.exit(1)
>     myCert = crypto.load_certificate(1, userCert)
>     if myCert.has_expired():
>         print "Certificate expired please get a new one"
>@@ -23,7 +22,7 @@
>     subjectLine = subject.split("CN=")
>     name = subjectLine[1].split("/")
>     return name[0]
>-      
>+
> 
> def cvsco(user, module):
>     '''CVSROOT=:ext:ausil@cvs.fedoraproject.org:/cvs/extras/'''
>@@ -49,7 +48,7 @@
>     if len(sys.argv) < 2:
>         usage()
>         sys.exit(1)
>-    #the package we want to pull from cvs 
>+    #the package we want to pull from cvs
>     pkg = sys.argv
>     pkg.remove(sys.argv[0])
>

Actions: View | Diff

Attachments on bug 445995: 305059