cvs commit: ports/www/py-rssdler Makefile ports/www/py-rssdler/files patch-rssdler.py

[Anonymous]

Anonymous <swell.k at gmail.com> writes:

> "Philip M. Gollucci" <pgollucci at FreeBSD.org> writes:
>
>> pgollucci    2010-10-10 04:36:38 UTC
>>
>>   FreeBSD ports repository
>>
>>   Modified files:
>>     www/py-rssdler       Makefile
>>   Added files:
>>     www/py-rssdler/files patch-rssdler.py
>>   Log:
[...]
> Other patches in PATCHDIR are split according to functions they touch as
> well as contain svn revision number in their comments.

It's this way because
- all patches can be applied separately
- the port has only one functional file, excluding wrapper in bin/

> Please, back out and commit patches with consistent names and without
> regenerating them for the sake of useless timestamps.

Well, this can be done in one step with below commit log

  - clear pidfile after runOnce as well
  - use consistent patch filenames (cosmetic)
  - generate patches with `svn diff -x -p' (cosmetic)
  PR: ports/151339

%%
Index: www/py-rssdler/Makefile
===================================================================
RCS file: /a/.cvsup/ports/www/py-rssdler/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- www/py-rssdler/Makefile	10 Oct 2010 04:36:38 -0000	1.3
+++ www/py-rssdler/Makefile	10 Oct 2010 12:54:55 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	rssdler
 PORTVERSION=	0.4.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
Index: www/py-rssdler/files/patch-_main
===================================================================
RCS file: www/py-rssdler/files/patch-_main
diff -N www/py-rssdler/files/patch-_main
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ www/py-rssdler/files/patch-_main	10 Oct 2010 12:56:34 -0000
@@ -0,0 +1,12 @@
+Index: rssdler.py
+===================================================================
+--- rssdler.py	(revision 169)
++++ rssdler.py	(working copy)
+@@ -2180,6 +2180,7 @@ def _main(arglist):
+         elif param == "--purge-saved": _action = 'purge-saved'
+         elif param == "--comment-config": _action = 'comment-config'
+     signal.signal(signal.SIGINT, signalHandler)
++    signal.signal(signal.SIGTERM, signalHandler)
+     sys.excepthook = setDebug #this is NOT supposed to be called!
+     if _action == 'comment-config':
+         print(commentConfig)
Index: www/py-rssdler/files/patch-main
===================================================================
RCS file: www/py-rssdler/files/patch-main
diff -N www/py-rssdler/files/patch-main
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ www/py-rssdler/files/patch-main	10 Oct 2010 12:56:19 -0000
@@ -0,0 +1,14 @@
+Index: rssdler.py
+===================================================================
+--- rssdler.py	(revision 169)
++++ rssdler.py	(working copy)
+@@ -2085,6 +2085,9 @@ def main( ):
+             raise
+         if _runOnce:
+             logging.info( u"[Complete] %s" % time.asctime() )
++            try: codecs.open(os.path.join(getConfig()['global']['workingDir'],
++                getConfig()['global']['daemonInfo']), 'w', 'utf-8').write('')
++            except IOError, m: pass
+             break
+         logging.info( u"[Sleeping] %s" % time.asctime() )
+         checkSleep( getConfig()['global']['scanMins'] * 60 )
Index: www/py-rssdler/files/patch-rssdler.py
===================================================================
RCS file: www/py-rssdler/files/patch-rssdler.py
diff -N www/py-rssdler/files/patch-rssdler.py
--- www/py-rssdler/files/patch-rssdler.py	10 Oct 2010 04:36:38 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- ./rssdler.py.orig	2010-10-10 03:58:44.112133159 +0000
-+++ ./rssdler.py	2010-10-10 03:59:10.937002223 +0000
-@@ -2180,6 +2180,7 @@
-         elif param == "--purge-saved": _action = 'purge-saved'
-         elif param == "--comment-config": _action = 'comment-config'
-     signal.signal(signal.SIGINT, signalHandler)
-+    signal.signal(signal.SIGTERM, signalHandler)
-     sys.excepthook = setDebug #this is NOT supposed to be called!
-     if _action == 'comment-config':
-         print(commentConfig)
%%