+1
----- "Ricky Zhou" <ricky@xxxxxxxxxxxxxxxxx> wrote:
> On 2009-02-02 09:31:08 AM, Ricky Zhou wrote:
> > On 2009-02-02 08:53:29 AM, Ricky Zhou wrote:
> > > On 2009-02-02 08:40:55 AM, Ricky Zhou wrote:
> > > > Looks like there's a problem with the fullfilelist tmpfile
> removal for
> > > > EPEL as well. Can I get some +1s for this patch?
> > > Actually, ignore that one. This might be a bit simpler:
> > Oops, I forgot to fix the same problem in fedora-updates-push.
> Here's
> > the latest patch that include all of my changes:
> Sorry again. I just realized that I reversed the if statement.
> That's
> what I get for not sleeping. Here the corrected version:
>
> diff --git a/configs/system/fedora-updates-push
> b/configs/system/fedora-updates-push
> index 8c09e27..380af87 100755
> --- a/configs/system/fedora-updates-push
> +++ b/configs/system/fedora-updates-push
> @@ -38,7 +38,8 @@ done
> pushd /pub/fedora/
> TMPFILE=$(mktemp -p /tmp/)
> find * -print > $TMPFILE
> -diff $TMPFILE fullfilelist >/dev/null
> -if [ "$?" = "1" ]; then
> +if diff $TMPFILE fullfilelist > /dev/null; then
> + rm -f $TMPFILE
> +else
> mv $TMPFILE fullfilelist
> fi
> diff --git a/manifests/services/mirrormaster.pp
> b/manifests/services/mirrormaster.pp
> index ca01522..b7c2b47 100644
> --- a/manifests/services/mirrormaster.pp
> +++ b/manifests/services/mirrormaster.pp
> @@ -18,7 +18,7 @@ class mirrormaster {
> }
>
> cron { epel-sync:
> - command => 'rsync -aHz --numeric-ids --delete-after
> --exclude=".snapshot" --exclude="*/build-logs"
> buildsys.fedoraproject.org::epel/ /pub/epel/ &>/dev/null &&
> TMPFILE=`mktemp -p /tmp`; pushd /pub/epel; find * -print > $TMPFILE;
> diff $TMPFILE fullfilelist >/dev/null; if [ "$?" = "1" ]; then mv
> $TMPFILE fullfilelist; fi',
> + command => 'rsync -aHz --numeric-ids --delete-after
> --exclude=".snapshot" --exclude="*/build-logs"
> buildsys.fedoraproject.org::epel/ /pub/epel/ &>/dev/null &&
> TMPFILE=$(mktemp -p /tmp); pushd /pub/epel; find * -print > $TMPFILE;
> if diff $TMPFILE fullfilelist > /dev/null; then rm -f $TMPFILE; else
> mv $TMPFILE fullfilelist; fi',
> user => ftpsync,
> minute => [ 10, 40 ],
> ensure => present,
>
> Thanks,
> Ricky
>
> _______________________________________________
> Fedora-infrastructure-list mailing list
> Fedora-infrastructure-list@xxxxxxxxxx
> https://www.redhat.com/mailman/listinfo/fedora-infrastructure-list
_______________________________________________
Fedora-infrastructure-list mailing list
Fedora-infrastructure-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-infrastructure-list
