[Frugalware-git] pacman-tools: repoman: less error handling, now dg detects conflicts on push/pull

Miklos Vajna vmiklos at frugalware.org
Mon Nov 12 13:01:00 CET 2007


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=f631c1734657f30c0423d724e8a2948408b76410

commit f631c1734657f30c0423d724e8a2948408b76410
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Mon Nov 12 13:00:53 2007 +0100

repoman: less error handling, now dg detects conflicts on push/pull

diff --git a/repoman b/repoman
index 764240e..bcc2f30 100755
--- a/repoman
+++ b/repoman
@@ -161,8 +161,6 @@ fpmmerge()
die "rsync failed! :/"
fi
# now push
-	dg pull -a || die 'dg pull failed'
-	git diff|grep -q -- 'diff --cc' && die 'detected conflicts'
dg push -a
# finally run repoman cl for each
for i in `$0 -t $1 ls /frugalware-$arch/ 2>/dev/null|sed 's/-[^-]\+-[^-]\+-[^-]\+$//'`
@@ -425,7 +423,7 @@ sync()
opts=""
fi
if [ "$F_makepkg_scm" = "git" ]; then
-		cmd="dg pull $opts || (git diff|grep -q -- 'diff --cc' && echo 'detected conflicts'; die 'dg pull failed'); dg push $opts"
+		cmd="dg push $opts"
else
cmd="darcs push --match 'name $modpkgname' $opts"
fi


More information about the Frugalware-git mailing list