gnumake2: merging minibranches

1 files changed, 5 insertions, 5 deletions

diff --git a/solenv/bin/packmodule b/solenv/bin/packmodule
index 6261bd25754f..3c50bd7f8588 100755
--- a/solenv/bin/packmodule
+++ b/solenv/bin/packmodule
@@ -28,26 +28,26 @@
 import os, os.path, sys, zipfile
 
 def paths_to_pack(loglines):
-    """Returns a generator iterating the outdir fields (with platform) of deliver.log lines."""
+    """Returns a generator iterating the outdir fields (with platform) of gb_deliver.log lines."""
     return (line.split()[2] for line in loglines)
 
 def stripped_paths_to_pack(loglines):
-    """returns a generator iterating the outdir fields (stripped of the platform) of deliver.log lines."""
+    """returns a generator iterating the outdir fields (stripped of the platform) of gb_deliver.log lines."""
     return (path.partition('/')[2] for path in paths_to_pack(loglines))
 
 def main(args):
-    """creates/overwrites a file at OUTDIR/zip/MILESTONE/MODULE.zip containing the contents of the deliver.log."""
+    """creates/overwrites a file at OUTDIR/zip/MILESTONE/MODULE.zip containing the contents of the gb_deliver.log."""
     if len(args) != 4:
         print('usage: packmodule OUTDIR MODULE MILESTONE')
         sys.exit(2)
     (executable, outdir, module, milestone) = args
     os.chdir(outdir)
-    zipdir = os.path.join('zip', milestone)
+    zipdir = 'zip.'+milestone
     try:
         os.makedirs(zipdir)
     except OSError:
         pass
-    deliverlog = open(os.path.join('inc', module, 'deliver.log'))
+    deliverlog = open(os.path.join('inc', module, 'gb_deliver.log'))
     packedmodule = zipfile.ZipFile(os.path.join(zipdir,module+'.zip'), 'w')
     [packedmodule.write(path) for path in stripped_paths_to_pack(deliverlog)]
     packedmodule.close()