# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1309038608 -7200
# Node ID 309fccde0b17d061812fa702f2c33cc886e4ed3d
# Parent  11aa32d2a3eca2f46b9999f460f518a89d0e2a88
Fixed a missing duration attribute in View instances with no calendar names.
Made page package construction consistent with the other moinsetup commands in
the installation instructions.

diff -r 11aa32d2a3ec -r 309fccde0b17 README.txt
--- a/README.txt	Sat Jun 25 22:11:49 2011 +0200
+++ b/README.txt	Sat Jun 25 23:50:08 2011 +0200
@@ -94,7 +94,7 @@
 through the Wiki and their contents copied in from each of the files. An
 easier installation method is to issue the following commands:
 
-  python moinsetup.py -f moinsetup.cfg make_page_package pages pages.zip
+  python moinsetup.py -f moinsetup.cfg make_page_package $EADIR/pages pages.zip
   python moinsetup.py -f moinsetup.cfg install_page_package pages.zip
 
 You may need to switch user in order to have sufficient privileges to copy the
@@ -112,7 +112,7 @@
 
 To install the resource pages, use the following commands:
 
-  python moinsetup.py -f moinsetup.cfg make_page_package resource_pages resource_pages.zip
+  python moinsetup.py -f moinsetup.cfg make_page_package $EADIR/resource_pages resource_pages.zip
   python moinsetup.py -f moinsetup.cfg install_page_package resource_pages.zip
 
 You may need to switch user in order to have sufficient privileges to copy the
diff -r 11aa32d2a3ec -r 309fccde0b17 macros/EventAggregator.py
--- a/macros/EventAggregator.py	Sat Jun 25 22:11:49 2011 +0200
+++ b/macros/EventAggregator.py	Sat Jun 25 23:50:08 2011 +0200
@@ -68,12 +68,12 @@
 
         self.category_name_parameters = "&".join([("category=%s" % name) for name in category_names])
 
+        self.duration = (last - first).count() + 1
+
         if self.calendar_name is not None:
 
             # Store the view parameters.
 
-            self.duration = (last - first).count() + 1
-
             self.previous_start = first.previous()
             self.next_start = first.next()
             self.previous_end = last.previous()