fix CentOS 7 require

1.add fail fast option
2.fix CentOS 7 require

Change-Id: Ieefcd8c748fe6a7708ade54f5d1c06dd0fa39504

Conflicts:
	depanneur

diff --git a/depanneur b/depanneur
index a5f5d60951f18bd3d060e713bddab29cb4223056..0567a31cd966aa30550e7625130906f9ca117c28 100755 (executable)
--- a/depanneur
+++ b/depanneur
@@ -87,7 +87,7 @@ my $includeall = 0;             # build all content of including uncommitted and
                                 # untracked files
 my $upstream_branch = "";       # upstream branch name
 my $upstream_tag = "";          # upstream tag name used for generate tar ball
-my $fallback_to_native = 0;     # fallback to native packaging mode if export fails
+my $fallback_to_native = 0;    # fallback to native packaging mode if export fails
 my $squash_patches_until = "";  # Commit_ID used for generate one patch
 my $no_patch_export = 0;        # don't generate patches if it's 1
 my $packaging_dir = "packaging";# packaging dir
@@ -1514,7 +1514,7 @@ sub worker_thread {
             info("build failed, exit...");
             $TERM = 1;
         }
-  }
+    }
 
     debug("*** build $name exit with status($status), is dirty:$dirty, (worker: $thread) ***");
     return $status;

diff --git a/packaging/depanneur.spec b/packaging/depanneur.spec
index 01b414d06d44a40d01715c2bca01708ba2d64ae6..dc15aa52029fc768236b81cd16f5703fcb7e092b 100644 (file)
--- a/packaging/depanneur.spec
+++ b/packaging/depanneur.spec
@@ -11,7 +11,11 @@ Requires:       perl(YAML)
 Requires:       perl(JSON)
 Requires:       perl(HTML::Template)
 Requires:       tizen-build >= 20140612
+%if 0%{?centos_ver} == 7
+
+%else
 Requires:       tizen-build-initvm-i586 >= 20140612
+%endif
 %ifarch         x86_64
 Requires:       tizen-build-initvm-x86_64 >= 20140612
 %endif