Include persoconf own dir in packages

commands/package.py

@@ -5,6 +5,8 @@ import os.path
 import time
 import tarfile
 
+import utils
+
 from metafile import Metafile, MalformedMetafileError
 
 # -----------------------------------------------------------------------------
@@ -30,6 +32,11 @@ def init(parser):
                          default="persoconf." + (time.strftime("%Y%m%d")),
                          help="The name of the package to create" )
 
+    parser.add_argument( "--nopersoconf", "-n",
+                         action="store_true",
+                         help="Do not include persoconf own config " \
+                              "directory in the resulting package" )
+
 # -----------------------------------------------------------------------------
 def run(args, persoconf, logger):
 
@@ -46,12 +53,14 @@ def run(args, persoconf, logger):
         # Load app META file
         try:
             appmetas.append(
-                    Metafile(json_path = os.path.join(
+                Metafile(
+                    json_path = os.path.join(
                         persoconf.path,
                         app,
-                        persoconf.metafile)
+                        persoconf.metafile
-                        )
                     )
+                )
+            )
 
         except FileNotFoundError:
             logger.warning( "Metafile %s does not exist for app %s; ignoring"
@@ -78,18 +87,53 @@ def run(args, persoconf, logger):
         pkg = tarfile.open(pkgname, "w:gz")
 
         for appmeta in appmetas:
+
+            # Add META file to the archive
+            if not args.nopersoconf:
+                filename_meta = os.path.join( persoconf.path,
+                                              appmeta.name,
+                                              persoconf.metafile )
+                filedest_meta = utils.contractuser( filename_meta )
+
+                if filedest_meta.startswith("~/"):
+                    filedest_meta = filedest_meta[2:]
+
+                try:
+                    pkg.add(filename_meta, arcname=filedest_meta)
+                    logger.info(
+                        "Adding app %s to package".format(appmeta.name)
+                    )
+
+                except Exception as e:
+                    logger.warning(
+                        "Failed to add app {app} to tar package {pkg}: {err}" \
+                            .format( app = appmeta.name,
+                                     pkg = pkgname,
+                                     err = str(e) )
+                    )
+
+
             for f in appmeta.files:
-                filename = persoconf.path +"/"+ appmeta.name +"/"+ f
+                filename    = os.path.join( persoconf.path,
-                filedest = appmeta.files[f]["dest"]
+                                            appmeta.name,
+                                            f )
+                filedest    = appmeta.files[f]["dest"]
+                filedest_pc = utils.contractuser( filename )
 
                 # Remove possible 'home'. The final targz should be extracted
                 # at $HOME.
                 if filedest.startswith("~/"):
                     filedest = filedest[2:]
+                if filedest_pc.startswith("~/"):
+                    filedest_pc = filedest_pc[2:]
 
                 # TODO save and restore owners and permissions
                 try:
                     pkg.add(filename, arcname=filedest)
+
+                    if not args.nopersoconf:
+                        pkg.add(filename, arcname=filedest_pc)
+
                     logger.info("Adding %s to package" % f)
 
                 except Exception as e: