[Oval-commits] r293 - in trunk/oval-server: . oval oval/dba oval/dsa2oval oval/dsa2oval/definition oval/dsa2oval/parser oval/dsaSync oval/server
Pavel Vinogradov
blaze-guest at alioth.debian.org
Tue Oct 30 17:43:19 UTC 2007
Author: blaze-guest
Date: 2007-10-30 17:43:19 +0000 (Tue, 30 Oct 2007)
New Revision: 293
Modified:
trunk/oval-server/OvalServer.TODO
trunk/oval-server/oval/__init__.py
trunk/oval-server/oval/dba/__init__.py
trunk/oval-server/oval/dba/dba.py
trunk/oval-server/oval/dsa2oval/__init__.py
trunk/oval-server/oval/dsa2oval/convertor.py
trunk/oval-server/oval/dsa2oval/definition/__init__.py
trunk/oval-server/oval/dsa2oval/definition/differ.py
trunk/oval-server/oval/dsa2oval/definition/generator.py
trunk/oval-server/oval/dsa2oval/parser/__init__.py
trunk/oval-server/oval/dsa2oval/parser/dsa.py
trunk/oval-server/oval/dsa2oval/parser/wml.py
trunk/oval-server/oval/dsaSync/__init__.py
trunk/oval-server/oval/dsaSync/directory.py
trunk/oval-server/oval/dsaSync/ftp.py
trunk/oval-server/oval/dsaSync/http.py
trunk/oval-server/oval/dsaSync/sync.py
trunk/oval-server/oval/server/OvalHttpServer.py
trunk/oval-server/oval/server/OvalServer.py
trunk/oval-server/oval/server/__init__.py
trunk/oval-server/setup.py
Log:
Add proper license information to all python files
Modified: trunk/oval-server/OvalServer.TODO
===================================================================
--- trunk/oval-server/OvalServer.TODO 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/OvalServer.TODO 2007-10-30 17:43:19 UTC (rev 293)
@@ -3,5 +3,4 @@
Implement rss sync
Filtering by release
-proper license headers in all code files, I don't see any of them with that
the server/agent should either warn about the cfg directories missing or should create them
Modified: trunk/oval-server/oval/__init__.py
===================================================================
--- trunk/oval-server/oval/__init__.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/__init__.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -1 +1,11 @@
-version = 0.2
+#
+# __init__.py: defines this directory as the 'oval' package
+#
+######################################################################
+#
+# Writen by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+# Licensed under the GNU General Public License version 2.
+#
+######################################################################
+__all__ = ['dba', 'dsa2oval', 'dsaSync', 'server']
+__version__ = 0.3
Modified: trunk/oval-server/oval/dba/__init__.py
===================================================================
--- trunk/oval-server/oval/dba/__init__.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/dba/__init__.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -3,10 +3,9 @@
#
######################################################################
#
-# (c) 2007 Pavel Vinogradov
+# Writen by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
# Licensed under the GNU General Public License version 2.
#
######################################################################
-
__all__ = ['dba']
-__version__ = 0.5
+__version__ = 0.3
Modified: trunk/oval-server/oval/dba/dba.py
===================================================================
--- trunk/oval-server/oval/dba/dba.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/dba/dba.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -1,3 +1,9 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Written by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+# Licensed under the GNU General Public License version 2.
+
from pysqlite2 import dbapi2 as db
from datetime import datetime
Modified: trunk/oval-server/oval/dsa2oval/__init__.py
===================================================================
--- trunk/oval-server/oval/dsa2oval/__init__.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/dsa2oval/__init__.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -3,10 +3,9 @@
#
######################################################################
#
-# (c) 2007 Pavel Vinogradov
+# Writen by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
# Licensed under the GNU General Public License version 2.
#
######################################################################
-
__all__ = ['definition', 'parser', 'convertor']
-__version__ = 0.5
+__version__ = 0.3
Modified: trunk/oval-server/oval/dsa2oval/convertor.py
===================================================================
--- trunk/oval-server/oval/dsa2oval/convertor.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/dsa2oval/convertor.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -1,3 +1,9 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Written by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+# Licensed under the GNU General Public License version 2.
+
import os
import sys
import xml.dom.ext
@@ -82,4 +88,4 @@
xml.dom.ext.PrettyPrint (generator.createOVALDefinitions(self.dsaref), file)
file.close()
else:
- xml.dom.ext.PrettyPrint (generator.createOVALDefinitions(self.dsaref))
\ No newline at end of file
+ xml.dom.ext.PrettyPrint (generator.createOVALDefinitions(self.dsaref))
Modified: trunk/oval-server/oval/dsa2oval/definition/__init__.py
===================================================================
--- trunk/oval-server/oval/dsa2oval/definition/__init__.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/dsa2oval/definition/__init__.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -3,12 +3,9 @@
#
######################################################################
#
-# (c) 2007 Pavel Vinogradov
+# Writen by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
# Licensed under the GNU General Public License version 2.
#
######################################################################
-
__all__ = ['generator', 'differ']
-__version__ = 0.5
-
-
+__version__ = 0.3
Modified: trunk/oval-server/oval/dsa2oval/definition/differ.py
===================================================================
--- trunk/oval-server/oval/dsa2oval/definition/differ.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/dsa2oval/definition/differ.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -1,3 +1,9 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Written by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+# Licensed under the GNU General Public License version 2.
+
import logging
from copy import deepcopy
Modified: trunk/oval-server/oval/dsa2oval/definition/generator.py
===================================================================
--- trunk/oval-server/oval/dsa2oval/definition/generator.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/dsa2oval/definition/generator.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -1,11 +1,15 @@
+#!/usr/bin/python
# -*- coding: utf-8 -*-
+#
+# Written by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+# Licensed under the GNU General Public License version 2.
+#
# oval.definitio.generator - generate well-formed xml file with
# OVAL definitions of Debian Security Advisories.
# Use various optimizations to minimize result XML
#
-# (c) 2007 Pavel Vinogradov
-# (c) 2004 Javier Fernandez-Sanguino
-# Licensed under the GNU General Public License version 2.
+# (c) 2007 Pavel Vinogradov
+# (c) 2004 Javier Fernandez-Sanguino
import re
import logging
Modified: trunk/oval-server/oval/dsa2oval/parser/__init__.py
===================================================================
--- trunk/oval-server/oval/dsa2oval/parser/__init__.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/dsa2oval/parser/__init__.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -3,12 +3,10 @@
#
######################################################################
#
-# (c) 2007 Pavel Vinogradov
+# Writen by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
# Licensed under the GNU General Public License version 2.
#
######################################################################
__all__ = ['dsa', 'wml']
-__version__ = 0.5
-
-
+__version__ = 0.3
Modified: trunk/oval-server/oval/dsa2oval/parser/dsa.py
===================================================================
--- trunk/oval-server/oval/dsa2oval/parser/dsa.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/dsa2oval/parser/dsa.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -1,4 +1,9 @@
+#!/usr/bin/python
# -*- coding: utf-8 -*-
+#
+# Written by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+# Licensed under the GNU General Public License version 2.
+#
# oval.parser.dsa - module to parse Debian Security Advisories files.
#
# Extrected tags:
@@ -10,8 +15,7 @@
# <fixed>
#
# (c) 2007 Pavel Vinogradov
-# (c) 2004 Javier Fernandez-Sanguino
-# Licensed under the GNU General Public License version 2.
+# (c) 2004 Javier Fernandez-Sanguino
import re
import os
Modified: trunk/oval-server/oval/dsa2oval/parser/wml.py
===================================================================
--- trunk/oval-server/oval/dsa2oval/parser/wml.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/dsa2oval/parser/wml.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -1,14 +1,19 @@
+#!/usr/bin/python
# -*- coding: utf-8 -*-
+#
+# Written by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+# Licensed under the GNU General Public License version 2.
+#
# oval.parser.wml - module to parse descriptions of
# Debian Security Advisories stored in wml format.
-# Extrected tags:
-# <description>
-# <moreinfo>- Paragraphs before descriptions of
-# each release status
#
+# Extracted tags:
+# <description>
+# <moreinfo> - Paragraphs before descriptions of
+# each release status
+#
# (c) 2007 Pavel Vinogradov
-# (c) 2004 Javier Fernandez-Sanguino
-# Licensed under the GNU General Public License version 2.
+# (c) 2004 Javier Fernandez-Sanguino
import re
import os
Modified: trunk/oval-server/oval/dsaSync/__init__.py
===================================================================
--- trunk/oval-server/oval/dsaSync/__init__.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/dsaSync/__init__.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -3,10 +3,9 @@
#
######################################################################
#
-# (c) 2007 Pavel Vinogradov
+# Writen by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
# Licensed under the GNU General Public License version 2.
#
######################################################################
-
__all__ = ['directory', 'ftp', 'http', 'sync']
-__version__ = 0.5
+__version__ = 0.3
Modified: trunk/oval-server/oval/dsaSync/directory.py
===================================================================
--- trunk/oval-server/oval/dsaSync/directory.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/dsaSync/directory.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -1,3 +1,9 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Written by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+# Licensed under the GNU General Public License version 2.
+
from sync import DsaSync
from datetime import datetime
from shutil import copy2
Modified: trunk/oval-server/oval/dsaSync/ftp.py
===================================================================
--- trunk/oval-server/oval/dsaSync/ftp.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/dsaSync/ftp.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -1,3 +1,9 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Written by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+# Licensed under the GNU General Public License version 2.
+
from sync import DsaSync
from datetime import datetime
from ftplib import FTP
@@ -130,4 +136,4 @@
upd = ftpSync('/debian/dsa', '/tmp/dsa', 'server')
upd.sync()
except ftpConnectException:
- logging.critical('Ftp server not available.')
\ No newline at end of file
+ logging.critical('Ftp server not available.')
Modified: trunk/oval-server/oval/dsaSync/http.py
===================================================================
--- trunk/oval-server/oval/dsaSync/http.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/dsaSync/http.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -1,3 +1,9 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Written by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+# Licensed under the GNU General Public License version 2.
+
from sync import DsaSync
from datetime import datetime
import os, re
@@ -131,4 +137,4 @@
upd = httpSync('/~blaze/debian/dsa/', '/tmp/dsa', 'server')
upd.sync()
except httpConnectException:
- logging.critical('Http server not available.')
\ No newline at end of file
+ logging.critical('Http server not available.')
Modified: trunk/oval-server/oval/dsaSync/sync.py
===================================================================
--- trunk/oval-server/oval/dsaSync/sync.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/dsaSync/sync.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -1,3 +1,9 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Written by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+# Licensed under the GNU General Public License version 2.
+
from datetime import datetime
import logging
from stat import *
@@ -56,4 +62,4 @@
file = path[len(self.dsaSource):]
(dir, file) = os.path.split(file)
self.syncfile (dir, file)
- self.logger.info('directorySync: synced %d files' % len(self.result))
\ No newline at end of file
+ self.logger.info('directorySync: synced %d files' % len(self.result))
Modified: trunk/oval-server/oval/server/OvalHttpServer.py
===================================================================
--- trunk/oval-server/oval/server/OvalHttpServer.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/server/OvalHttpServer.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -1,3 +1,9 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Written by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+# Licensed under the GNU General Public License version 2.
+
import SimpleHTTPServer, BaseHTTPServer
from OpenSSL import SSL
from oval.dba.dba import dba
Modified: trunk/oval-server/oval/server/OvalServer.py
===================================================================
--- trunk/oval-server/oval/server/OvalServer.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/server/OvalServer.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -1,3 +1,9 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Written by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+# Licensed under the GNU General Public License version 2.
+
from OvalHttpServer import *
import sys, os
@@ -19,4 +25,4 @@
if __name__ == "__main__":
oval = OvalServer ()
- oval.run()
\ No newline at end of file
+ oval.run()
Modified: trunk/oval-server/oval/server/__init__.py
===================================================================
--- trunk/oval-server/oval/server/__init__.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/oval/server/__init__.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -3,10 +3,9 @@
#
######################################################################
#
-# (c) 2007 Pavel Vinogradov
+# Writen by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
# Licensed under the GNU General Public License version 2.
#
######################################################################
-
__all__ = ['OvalHttpServer', 'OvalServer']
-__version__ = 0.5
+__version__ = 0.3
Modified: trunk/oval-server/setup.py
===================================================================
--- trunk/oval-server/setup.py 2007-10-30 17:41:39 UTC (rev 292)
+++ trunk/oval-server/setup.py 2007-10-30 17:43:19 UTC (rev 293)
@@ -1,8 +1,8 @@
#!/usr/bin/python
-#
-# Written by Pavel VInogradov
-# see LICENSE.txt for license information
-#
+# -*- coding: utf-8 -*-
+#
+# Written by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+# Licensed under the GNU General Public License version 2.
"""The oval-agent program for interact with oval-server daemon.
@@ -22,7 +22,7 @@
author = "Pavel Vinogradov",
author_email = "<oval-devel at lists.alioth.debian.org>",
url = "http://oval.alioth.debian.org",
- license = "GPL",
+ license = "GPL2",
packages = ["oval.dba", "oval.dsa2oval", "oval.dsa2oval.definition", "oval.dsa2oval.parser", "oval.dsaSync", "oval.server", "oval" ],
More information about the Oval-commits
mailing list