OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-tools                    Date:   22-Sep-2006 10:02:07
  Branch: HEAD                             Handle: 2006092209020700

  Modified files:
    openpkg-tools/cmd       bf-mk.pl

  Log:
    use local controlled permissions when transferring data using rsync

  Summary:
    Revision    Changes     Path
    1.37        +3  -3      openpkg-tools/cmd/bf-mk.pl
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-tools/cmd/bf-mk.pl
  ============================================================================
  $ cvs diff -u -r1.36 -r1.37 bf-mk.pl
  --- openpkg-tools/cmd/bf-mk.pl        22 Sep 2006 08:00:10 -0000      1.36
  +++ openpkg-tools/cmd/bf-mk.pl        22 Sep 2006 08:02:07 -0000      1.37
  @@ -315,7 +315,7 @@
   
       #   download sources and remove those to be skipped
       &shtoolechoe("%B++ MASTER:$shared: download sources and remove those to 
be skipped%b");
  -    system("$rsync -rt --delete --exclude \"Makefile*\" \"$source\" 
\"$shared/src/master/\"") == 0 || die("cannot rsync source RPMs from 
\"$source\" ($!)");
  +    system("$rsync -rt --perms --chmod=ug+w,a+r --delete --exclude 
\"Makefile*\" \"$source\" \"$shared/src/master/\"") == 0 || die("cannot rsync 
source RPMs from \"$source\" ($!)");
       foreach my $p (split(/ /, $skippkg)) {
           #FIXME obey name-version-release instead only unlinking
           for my $f (<$shared/src/master/$p>) {
  @@ -326,7 +326,7 @@
       #   download sources with norestriction to replace .nosrc.rpm
       &shtoolechoe("%B++ MASTER:$shared: download sources with norestriction 
to replace .nosrc.rpm%b");
       if ($nosource) {
  -        system("$rsync -rt --delete --exclude \"Makefile*\" \"$nosource\" 
\"$shared/src/master.norestriction/\"") == 0 || die("cannot rsync nosource RPMs 
from \"$nosource\" ($!)");
  +        system("$rsync -rt --perms --chmod=ug+w,a+r --delete --exclude 
\"Makefile*\" \"$nosource\" \"$shared/src/master.norestriction/\"") == 0 || 
die("cannot rsync nosource RPMs from \"$nosource\" ($!)");
       }
       foreach my $package (<$shared/src/master/*.nosrc.rpm>) {
           unlink $package || die "cannot erase \"$package\"";
  @@ -523,7 +523,7 @@
       %{slave.rm} -f $target/*.src.rpm
       if [ ".%{slave.remote}" != . ]; then
           echo "downloading sources from remote master 
%{slave.remote}/src/master"
  -        %{slave.rsync} -ar %{slave.remote}/src/master 
"%{shared.folder}/src/$HOST-$ARCH-$OS" #FIXME --delete
  +        %{slave.rsync} -ar --perms --chmod=ug+w,a+r 
%{slave.remote}/src/master "%{shared.folder}/src/$HOST-$ARCH-$OS" #FIXME 
--delete
       fi
       for srpm in `cd $source && ls -1 *.src.rpm | sort`; do
           %{slave.ln} $source/$srpm $target/
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to