Merge pull request #115 from goldmann/dist-git-bugfix

Dist git sync fixes

Author: Jonathan Dowland

dogen/generator.py

@@ -338,9 +338,11 @@ def handle_sources(self):
                 if algorithms:
                     for algorithm in algorithms:
                         self.check_sum(filename, source[algorithm], algorithm)
-                    self.cfg['artifacts'][target] = "%s:%s" % (algorithms[0], source[algorithms[0]])
-                else:
-                    self.cfg['artifacts'][target] = None
+
+            if algorithms:
+                self.cfg['artifacts'][target] = "%s:%s" % (algorithms[0], source[algorithms[0]])
+            else:
+                self.cfg['artifacts'][target] = None
 
     def check_sum(self, filename, checksum, algorithm):
         self.log.info("Checking '%s' %s hash..." % (os.path.basename(filename), algorithm))

dogen/plugins/dist_git.py

@@ -27,7 +27,7 @@ def prepare(self, cfg):
         if not self.args.dist_git_enable:
             return
         self.git.prepare()
-        self.git.clean()
+        self.git.clean_scripts()
 
     def after_sources(self, files):
         if not self.args.dist_git_enable:
@@ -85,7 +85,7 @@ def update(self):
         self.update_value("JBOSS_IMAGE_RELEASE", new_release)
         self.update_dist_git(new_version, new_release)
 
-    def clean(self):
+    def clean_scripts(self):
         """ Removes the scripts directory from staging and disk """
         shutil.rmtree(os.path.join(self.path, "scripts"), ignore_errors=True)
 
@@ -177,8 +177,12 @@ def update_lookaside_cache(self, artifacts):
 
     def update_dist_git(self, version, release):
         with Chdir(self.path):
-            # Add everything
-            subprocess.check_call(["git", "add", "."])
+            # Add new Dockerfile
+            subprocess.check_call(["git", "add", "Dockerfile"])
+
+            # Add the scripts directory if it exists
+            if os.path.exists(os.path.join(self.path, "scripts")):
+                subprocess.check_call(["git", "add", "scripts"])
 
         commit_msg = "Sync"