File copy doesn't work if the glob can match directories.

Fixes bug #10705.

gramps/gen/const.py

@@ -132,7 +132,7 @@ sys.path.insert(0, ROOT_DIR)
 git_revision = get_git_revision(ROOT_DIR)
 if sys.platform == 'win32' and git_revision == "":
     git_revision = get_git_revision(os.path.split(ROOT_DIR)[1])
-#VERSION += git_revision
+VERSION += git_revision
 #VERSION += "-1"
 
 #
@@ -190,7 +190,7 @@ GTK_GETTEXT_DOMAIN = 'gtk30'
 #
 #-------------------------------------------------------------------------
 COPYRIGHT_MSG  = "© 2001-2006 Donald N. Allingham\n" \
-                 "© 2007-2016 The Gramps Developers"
+                 "© 2007-2018 The Gramps Developers"
 COMMENTS       = _("Gramps\n (Genealogical Research and Analysis "
                    "Management Programming System)\n"
                    "is a personal genealogy program.")

gramps/gen/db/write.py

@@ -763,11 +763,11 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
         
         # The DB_PRIVATE flag must go if we ever move to multi-user setup
         env_flags = db.DB_CREATE | db.DB_PRIVATE |\
-                    db.DB_INIT_MPOOL |\
-                    db.DB_INIT_LOG | db.DB_INIT_TXN
-
-        # As opposed to before, we always try recovery on databases
-        env_flags |= db.DB_RECOVER
+                    db.DB_INIT_MPOOL
+        if not self.readonly:
+            env_flags |= db.DB_INIT_LOG | db.DB_INIT_TXN
+            # As opposed to before, we always try recovery on databases
+            env_flags |= db.DB_RECOVER
 
         # Environment name is now based on the filename
         env_name = name
@@ -782,7 +782,8 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
                 pass
             raise DbEnvironmentError(msg)
 
-        self.env.txn_checkpoint()
+        if not self.readonly:
+            self.env.txn_checkpoint()
 
         if callback:
             callback(25)
@@ -1478,7 +1479,8 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
             return
         if self.txn:
             self.transaction_abort(self.transaction)
-        self.env.txn_checkpoint()
+        if not self.readonly:
+            self.env.txn_checkpoint()
 
         self.__close_metadata()
         self.name_group.close()

gramps/gen/plug/docgen/graphdoc.py

@@ -986,7 +986,7 @@ class GVPdfGsDoc(GVDocBase):
             os.system(command)
         # Merge pieces to single multipage PDF ;
         command = '%s -q -dBATCH -dNOPAUSE '\
-            '-sOUTPUTFILE=%s -r72 -sDEVICE=pdfwrite %s '\
+            '-sOUTPUTFILE="%s" -r72 -sDEVICE=pdfwrite %s '\
             % (_GS_CMD, self._filename, ' '.join(list_of_pieces))
         os.system(command)
 

gramps/gui/widgets/fanchartdesc.py

@@ -615,7 +615,7 @@ class FanChartDescWidget(FanChartBaseWidget):
         elif nrparent <= 4:
             angleinc = math.pi/2
         else:
-            angleinc = 2 * math.pi / nrchild
+            angleinc = 2 * math.pi / nrparent
         for data in self.parentsroot:
             self.draw_innerring(cr, data[0], data[1], startangle, angleinc)
             startangle += angleinc

gramps/version.py

@@ -18,6 +18,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION_TUPLE = (4, 2, 8)
+VERSION_TUPLE = (4, 2, 9)
 VERSION        = '.'.join(map(str,VERSION_TUPLE))
 major_version = "%s.%s" % (VERSION_TUPLE[0], VERSION_TUPLE[1])

mac/Info.plist

@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>
     <string>Gramps</string>
     <key>CFBundleGetInfoString</key>
-    <string>Gramps-4.2.6, (C) 1997-2017 The Gramps Team http://www.gramps-project.org</string>
+    <string>Gramps-4.2.8, (C) 1997-2018 The Gramps Team http://www.gramps-project.org</string>
     <key>CFBundleIconFile</key>
     <string>gramps.icns</string>
     <key>CFBundleIdentifier</key>
@@ -17,11 +17,11 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>4.2.6</string>
+    <string>4.2.8</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>Gramps-4.2.6-1</string>
+    <string>Gramps-4.2.8-1</string>
     <key>NSHumanReadableCopyright</key>
     <string>Copyright 1997 - 2017 The Gramps Team, GNU General Public License.</string>
     <key>LSMinimumSystemVersion</key>

mac/gramps.bundle

@@ -231,4 +231,15 @@
     ${project}/settings.ini
   </data>
 
+  <data>
+    ${prefix}/share/doc/gramps/*
+  </data>
+  
+  <data>
+    ${prefix}/share/doc/gramps/example/gedcom/sample.ged
+  </data>
+
+  <data>
+    ${prefix}/share/doc/gramps/example/gramps/*
+  </data>
 </app-bundle>

mac/gramps.modules

@@ -18,7 +18,7 @@
   <repository type="tarball" name="oracle"
 	      href="http://download.oracle.com/"/>
   <repository type="tarball" name="pymodules"
-	      href="http://pypi.python.org/packages/source/"/>
+	      href="https://pypi.python.org/packages/"/>
   <repository type="tarball" name="stowers"
 	     href="http://www.johnstowers.co.nz/files/"/>
   <repository type="git" name="github"
@@ -66,9 +66,9 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   </distutils>
 
   <distutils id="gramps" supports-non-srcdir-builds="no">
-    <branch module="gramps-project/gramps/archive/v4.2.6.tar.gz"
-	    repo="github-tarball" version="4.2.6"
-	    checkoutdir="gramps-gramps-4.2.6"/>
+    <branch module="gramps-project/gramps/archive/v4.2.8.tar.gz"
+	    repo="github-tarball" version="4.2.8"
+	    checkoutdir="gramps-gramps-4.2.8"/>
     <dependencies>
       <dep package="meta-gramps-modules"/>
     </dependencies>
@@ -112,9 +112,12 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
 	     supports-non-srcdir-builds="no">
     <branch module="nzjrs/osm-gps-map" revision="1.0.2" repo="github"/>
     <dependencies>
-      <dep package="meta-gtk-osx-gtk3"/>
       <dep package="libsoup"/>
     </dependencies>
+    <after>
+      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="meta-gtk-osx-gtk3.14"/>
+    </after>
   </autotools>
 
   <autotools id="graphviz" autogen-sh="configure"
@@ -160,8 +163,8 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   </distutils>
 
  <distutils id='pyicu'>
-    <branch version='1.8' repo='pymodules'
-	    module='P/PyICU/PyICU-1.8.tar.gz'/>
+    <branch version='2.0.3' repo='pymodules'
+	    module='bb/ef/3a7fcbba81bfd213e479131ae21445a2ddd14b46d70ef0109640b580bc5d/PyICU-2.0.3.tar.gz'/>
     <dependencies>
       <dep package='icu'/>
     </dependencies>
@@ -170,8 +173,7 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   <metamodule id="meta-gramps-modules">
     <dependencies>
       <dep package="python3"/>
-      <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="gtk-mac-integration-python"/>
+      <dep package="meta-gtk-osx-gtk3.14"/>
       <dep package="meta-gtk-osx-gtk3-core-themes"/>
       <dep package="goocanvas2"/>
       <dep package="librsvg"/>
@@ -183,10 +185,12 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
       <dep package="pil"/>
       <dep package="gexiv2"/>
       <dep package="berkeleydb"/>
+      <dep package="gtk-mac-integration-python"/>
       <dep package="pycairo"/>
       <dep package="pygobject3"/>
       <dep package='pyicu'/>
       <dep package='pybsddb'/>
+      <dep package="pil"/>
     </dependencies>
   </metamodule>