diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-05 19:08:55 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-05 19:08:55 -0300 |
| commit | 784f927dcf2cc497d4a2c44fb4f1321d9cf0c45b (patch) | |
| tree | faa5f190e79e79c18b4d56c6fa643e6f251e4563 /v4l | |
| parent | 33059960a17b83a720e88a4093d4fc40a1a307a4 (diff) | |
| parent | 59ad1e534e569f743df108421f369cbf915f2e6e (diff) | |
| download | mediapointer-dvb-s2-784f927dcf2cc497d4a2c44fb4f1321d9cf0c45b.tar.gz mediapointer-dvb-s2-784f927dcf2cc497d4a2c44fb4f1321d9cf0c45b.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/ivtv
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l')
| -rwxr-xr-x | v4l/scripts/do_merge.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/v4l/scripts/do_merge.pl b/v4l/scripts/do_merge.pl index 1a6bbb1ee..6eccd77e7 100755 --- a/v4l/scripts/do_merge.pl +++ b/v4l/scripts/do_merge.pl @@ -64,7 +64,7 @@ sub check_status() sub rollback() { - print "Rolling back hg pull $merge_tree\n"; + print "*** ERROR *** Rolling back hg pull $merge_tree\n"; system("hg rollback"); system("hg update -C"); exit -1; @@ -96,7 +96,7 @@ if ($user eq "") { # Last try to come up with something if ($user eq "") { - print "User not known. Can't procceed\n"; + print "*** ERROR *** User not known. Can't procceed\n"; exit -1; } @@ -158,7 +158,7 @@ if (!ret) { $ret = system ('make mismatch|egrep -v "^\s*CC"|egrep -v "^\s*LD"'); } if ($ret) { - print "Build failed. Can't procceed.\n"; + print "*** ERROR *** Build failed. Can't procceed.\n"; # To avoid the risk of doing something really bad, let's ask the user to run hg strip print "Your tree is dirty. Since hg has only one rollback level, you'll need to use, instead:"; |