Attachment 100531 Details for Bug 139827 – file.diff

[patch] file.diff

file.diff (text/plain), 1.93 KB, created by R.Mahmatkhanov on 2009-10-21 22:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: R.Mahmatkhanov

Created: 2009-10-21 22:20:00 UTC

Size: 1.93 KB

patch

obsolete

>diff -ruN gtg.old/Makefile gtg/Makefile
>--- gtg.old/Makefile	2009-09-14 11:53:01.000000000 +0400
>+++ gtg/Makefile	2009-10-22 01:03:14.000000000 +0400
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	gtg
> PORTVERSION=	0.1.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	deskutils gnome python
> MASTER_SITES=	http://launchpad.net/gtg/trunk/${PORTVERSION}/+download/
> 
>diff -ruN gtg.old/files/patch-GTG_gtg.py gtg/files/patch-GTG_gtg.py
>--- gtg.old/files/patch-GTG_gtg.py	1970-01-01 03:00:00.000000000 +0300
>+++ gtg/files/patch-GTG_gtg.py	2009-10-22 01:00:54.000000000 +0400
>@@ -0,0 +1,40 @@
>+--- GTG/gtg.py.orig	2009-07-04 16:26:24.000000000 +0400
>++++ GTG/gtg.py	2009-09-16 19:43:28.000000000 +0400
>+@@ -58,28 +58,24 @@
>+ #we allow one instance of gtg by data directory.
>+ def check_instance(directory):
>+     """ Check if gtg is already running. """
>+-    pidfile = directory  + "gtg.pid"
>++    pidfile = os.path.join(directory, "gtg.pid")
>+     if not os.path.exists(pidfile):
>+-        f = open(pidfile, "w")
>+-        f.close()
>+-    os.chmod(pidfile, 0600)
>++        open(pidfile, "w").close()
>++        os.chmod(pidfile, 0600)
>+ 
>+     #see if gtg is already running
>+-    f = open(pidfile, "r")
>+-    pid = f.readline()
>+-    f.close()
>++    pid = open(pidfile, "r").readline()
>+     if pid:
>+-        p = os.system("ps --no-heading --pid " + pid)
>+-        p_name = os.popen("ps -f --pid " + pid).read()
>++        p = os.system("/bin/ps %s >/dev/null" % pid)
>++        p_name = os.popen("/bin/ps -f %s" % pid).read()
>+         if p == 0 and "gtg" in p_name:
>+             print _("gtg is already running!")
>+             #todo : expose the browser (will be possible when we have dbus)
>+             sys.exit(0)
>+-            
>++
>+     #write the pid file
>+-    f = open(pidfile, "w")
>+-    f.write(str(os.getpid()))
>+-    f.close()
>++    with open(pidfile, "w") as f:
>++      f.write(`os.getpid()`)
>+ 
>+ #=== MAIN CLASS ================================================================
>+

Actions: View | Diff

Attachments on bug 139827: 100531