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

commit 503f8d79dc257b541e9e697c412df85534ae8c4d
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Mon Jan 25 19:56:04 2010 +0100

repoman: move the rsync check from update() to fpmmerge()

These days the default mirror list uses git://, so it's no good forcing
users to install rsync. The fpmmerge subcommand (used by developers
only) still uses rsync, though, so just move it to there.

diff --git a/repoman b/repoman
index 7653021..a4d2103 100755
--- a/repoman
+++ b/repoman
@@ -1,6 +1,6 @@
#!/bin/bash

-# (c) 2005, 2006, 2007, 2008, 2009 Miklos Vajna <vmik...@frugalware.org>
+# (c) 2005, 2006, 2007, 2008, 2009, 2010 Miklos Vajna <vmik...@frugalware.org>
# repoman for Frugalware
# distributed under GPL License

@@ -359,6 +359,8 @@ upload()

fpmmerge()
{
+       if [ ! "`type -p rsync`" ]; then
+               die "The rsync program is missing. Please install it with 
pacman-g2 -S rsync."
if [ -z "$1" ]; then
echo "fpmmerge needs a parameter! (a repo name to pull in fpms from)"
usage
@@ -686,8 +688,6 @@ die()

update()
{
-       if [ ! "`type -p rsync`" ]; then
-               die "The rsync program is missing. Please install it with 
pacman-g2 -S rsync."
elif [ ! "`type -p git`" ]; then
die "The git program is missing. Please install it with pacman-g2 -S git."
fi
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to