[ckan-changes] commit/ckan: rgrp: [merge, from-branch][s]: merge a few minor revisions from release-v1.4.

Bitbucket commits-noreply at bitbucket.org
Thu May 12 20:20:24 UTC 2011


1 new changeset in ckan:

http://bitbucket.org/okfn/ckan/changeset/867982fbb441/
changeset:   r3079:867982fbb441
user:        rgrp
date:        2011-05-12 22:12:18
summary:     [merge,from-branch][s]: merge a few minor revisions from release-v1.4.
affected #:  5 files (315 bytes)

--- a/ckan/config/deployment.ini_tmpl	Tue May 10 21:07:00 2011 +0100
+++ b/ckan/config/deployment.ini_tmpl	Thu May 12 21:12:18 2011 +0100
@@ -183,7 +183,7 @@
 handlers = console, file
 
 [logger_ckan]
-level = DEBUG
+level = INFO
 handlers = console, file
 qualname = ckan
 propagate = 0
@@ -201,10 +201,10 @@
 formatter = generic
 
 [handler_file]
-class = handlers.RotatingFileHandler
+class = logging.handlers.RotatingFileHandler
 formatter = generic
 level = NOTSET
-args = ('%(here)s/ckan.log', 'a', 2000000, 9)
+args = ('%(here)s/ckan.log', 'a', 2e7, 9)
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s


--- a/ckan/templates/_util.html	Tue May 10 21:07:00 2011 +0100
+++ b/ckan/templates/_util.html	Thu May 12 21:12:18 2011 +0100
@@ -49,36 +49,38 @@
 				${h.link_to(package.title or package.name, h.url_for(controller='package', action='read', id=package.name))}
 			</span>
 			
-			<p class="search_meta">
-    			<py:if test="package.resources">
-        			<ul class="package_formats">
-        			    <py:for each="resource in package.resources">
-        			        <py:if test="resource.format and not resource.format == ''">
-        				        <li>${resource.format}</li>
-                            </py:if>
-        				</py:for>
-        			</ul>
-        		</py:if>
-        		<ul class="openness">
-            		<py:choose>
-                        <li py:when="package.isopen() and package.resources">
-                            <a href="http://www.opendefinition.org/okd/" title="This package satisfies the Open Knowledge Definition.">
-                                <img src="http://assets.okfn.org/images/ok_buttons/od_80x15_blue.png" alt="[Open Data]" />
-                            </a>
-                        </li>
-                        <li py:when="package.isopen() and package.resources">
-                            <a href="http://www.opendefinition.org/okd/" title="This package satisfies the Open Knowledge Definition.">
-                                <img src="http://assets.okfn.org/images/ok_buttons/oc_80x15_blue.png" alt="[Open Content]" />
-                            </a>
-                        </li>
-                        <li py:otherwise="">
-                            <span class="closed">
-                                ${h.icon('lock')} Data Not Open
-                            </span>
-                        </li>
-                    </py:choose>
-                </ul>
-            </p>
+			<div class="search_meta">
+        <py:if test="package.resources">
+          <ul class="package_formats">
+            <py:for each="resource in package.resources">
+              <py:if test="resource.format and not resource.format == ''">
+                <li>${resource.format}</li>
+              </py:if>
+            </py:for>
+          </ul>
+        </py:if>
+        <ul class="openness">
+          <py:if test="package.isopen()">
+            <li>
+              <a href="http://opendefinition.org/okd/" title="This package satisfies the Open Definition.">
+                  <img src="http://assets.okfn.org/images/ok_buttons/od_80x15_blue.png" alt="[Open Data]" />
+              </a>
+            </li>
+            <li>
+              <a href="http://opendefinition.org/okd/" title="This package satisfies the Open Definition.">
+                  <img src="http://assets.okfn.org/images/ok_buttons/oc_80x15_blue.png" alt="[Open Content]" />
+              </a>
+            </li>
+          </py:if>
+          <py:if test="not package.isopen()">
+            <li>
+              <span class="closed">
+                ${h.icon('lock')} Not Openly Licensed
+              </span>
+            </li>
+          </py:if>
+        </ul>
+      </div></div><div class="extract">
 			${h.markdown_extract(package.notes)}


--- a/doc/deb.rst	Tue May 10 21:07:00 2011 +0100
+++ b/doc/deb.rst	Thu May 12 21:12:18 2011 +0100
@@ -93,7 +93,7 @@
 ``present``
     Those that already exist as packages in Ubuntu Lucid
 
-``misssing``
+``missing``
     Those that don't exist as packages in Ubuntu Lucid
 
 ``conflict``
@@ -138,7 +138,7 @@
 
 .. note ::
 
-   These are already packaged, so you don't need to pacakge them yourself, this
+   These are already packaged, so you don't need to package them yourself, this
    section just describes how you *could* do if you wanted to.
 
 Python dependencies listed in the ``lucid_missing.txt`` file are ``pip``
@@ -169,7 +169,7 @@
     cd missing
     bin/python -m buildkit.update_all .
 
-For each pacakge you'll be loaded into ``vim`` to edit the changelog. Save and
+For each package you'll be loaded into ``vim`` to edit the changelog. Save and
 quit when you are done. Names, version numbers and dependencies are
 automatically generated.
 
@@ -177,7 +177,7 @@
 
    Most of the time you will never use the automatic process above for lazy
    batch packaging. You'll more likely generate a single package with explicit
-   version numners using the ``buildkit.deb`` command or build your package
+   version numbers using the ``buildkit.deb`` command or build your package
    manually. Both approaches are described later.
 
 Packaging Conflicting Python dependencies from ``lucid_conflicts.txt``
@@ -185,15 +185,15 @@
 
 .. note ::
 
-   These are already packaged, so you don't need to pacakge them yourself, this
+   These are already packaged, so you don't need to package them yourself, this
    section just describes how you *could* do if you wanted to.
 
 Python packages where CKAN depends on a version that is different from the one
 in the Ubuntu Lucid repositories are handled slightly differently. If we were
 to simply package them up and make them available the same way we do with
 missing packages there is a slim chance that any existing software which used
-the other version of the libray would stop working. To avoid the risk of
-interfering with other software on the sytem we take the following approach:
+the other version of the library would stop working. To avoid the risk of
+interfering with other software on the system we take the following approach:
 
 * Create a ``python-ckan-deps`` package with copies of all the libraries we need
 * Change the ``python-ckan`` library to automatically try to import
@@ -245,7 +245,7 @@
 
 ``/path/to/virtualenv``
     I think this can just be the path to the directory containing the 
-    installed source code directoty you wish to package, it doesn't
+    installed source code directory you wish to package, it doesn't
     have to be a virtualenv does it?
 
 ``ckanext-qa``
@@ -254,7 +254,7 @@
 
 ``1.3~01+lucid``
     The version number of the package. There are three parts to this:
-
+x
     ``1.3``
         This should always match exactly the version number specified in the 
         ``setup.py`` file for the library being packaged.
@@ -279,7 +279,7 @@
 
 ``python-owslib python-ckanext-csw ... etc``
 
-    Any extra arguments are treated as the Debain names of dependencies.  These
+    Any extra arguments are treated as the Debian names of dependencies.  These
     always begin ``python-`` for Python libraries and would usually follow
     ``ckanext-`` for all CKAN extensions. 
 
@@ -305,7 +305,7 @@
 
 .. note ::
    
-    All pacakges that CKAN itself depends on are already packaged according to
+    All packages that CKAN itself depends on are already packaged according to
     the settings in the three ``requires`` files that from part of the ``ckan``
     source distribution so you shouldn't need to use the approach above to 
     package any of them, you should only need to do this for your own extensions
@@ -644,7 +644,7 @@
     cd missing
     bin/python -m buildkit.update_all .
 
-For each pacakge you'll be loaded into ``vim`` to edit the changelog. Save and
+For each package you'll be loaded into ``vim`` to edit the changelog. Save and
 quit when you are done. Names, version numbers and dependencies are
 automatically generated.

Repository URL: https://bitbucket.org/okfn/ckan/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.




More information about the ckan-changes mailing list