Changeset 594 for branches

Timestamp:

12/27/2011 18:30:49 (5 months ago)

Author:

blee

Message:

Merge fix for #155 into confman-1.9.

Closes #155

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• confman.conf.5.in (modified) (1 diff)
• confman.conf.in (modified) (1 diff)
• confmanlib.sh.in (modified) (2 diffs)

branches/confman-1.9/confman.conf.5.in

@@ -132 +132 @@
 .Xr confexport 8 and
 .Xr confsync 8 machines.
+.It CONF_EXPORT_FILEDB_PLUS_SVN
+When enabled,
+.Xr confexport 8 will also include Subversion metadata in export tarballs.
+This allows multiple versions of confsync clients to be supported in parallel
+by a single confexport server.  Upgraded confsync clients will automatically
+prefer to use the filedb metadata when it is available.  This option has no
+effect unless CONF_EXPORT_FILEDB is also enabled.
 .It CONF_FETCH_SSH_KEY
 This is a private SSH keyfile for use with "sftp://" and "scp://" URIs above.

branches/confman-1.9/confman.conf.in

@@ -86 +86 @@
 CONF_EXPORT_INCREMENTAL_LN="false"
 CONF_EXPORT_FILEDB="false"
+CONF_EXPORT_FILEDB_PLUS_SVN="false"
 EXPORT_REPO_PROTOCOL=""
 EXPORT_REPO_HOSTNAME=""

branches/confman-1.9/confmanlib.sh.in

@@ -511 +511 @@
 
                     echo "Generating new export for module: ${module}"
-                    tar -hczf "${exportpath}/${module}.tgz" -C "${WORK_PATH}" --exclude='*.svn*' ${module} "meta/${module}.fdb" || return 1
+                    if ${CONF_EXPORT_FILEDB_PLUS_SVN}; then
+                        tar -hczf "${exportpath}/${module}.tgz" -C "${WORK_PATH}" ${module} "meta/${module}.fdb" || return 1
+                    else
+                        tar -hczf "${exportpath}/${module}.tgz" -C "${WORK_PATH}" --exclude='*.svn*' ${module} "meta/${module}.fdb" || return 1
+                    fi
 
                     # XXX: The fdbs aren't versioned yet (ticket #151), so
@@ -594 +598 @@
                     echo "Generating new export for recipe: ${recipe}"
                     modules=$(conf_get_recipe $(conf_recipe_dir)/${recipe})
-                    tar -hczf "${exportpath}/${recipe}.tgz" -C "${WORK_PATH}" --exclude='*.svn*' "meta/meta.fdb" "meta/recipes/${recipe}" $(for module in ${modules}; do echo "meta/${module}.fdb"; done) ${modules} || return 1
+                    if ${CONF_EXPORT_FILEDB_PLUS_SVN}; then
+                        tar -hczf "${exportpath}/${recipe}.tgz" -C "${WORK_PATH}" "meta/meta.fdb" "meta/recipes/${recipe}" $(for module in ${modules}; do echo "meta/${module}.fdb"; done) ${modules} || return 1
+                    else
+                        tar -hczf "${exportpath}/${recipe}.tgz" -C "${WORK_PATH}" --exclude='*.svn*' "meta/meta.fdb" "meta/recipes/${recipe}" $(for module in ${modules}; do echo "meta/${module}.fdb"; done) ${modules} || return 1
+                    fi
                 done
             else