- s/arch:/file:/ in info files

Changed files:
    bin/from-incoming.sh -> 1.2
    bin/move.sh -> 1.2

diff --git a/bin/from-incoming.sh b/bin/from-incoming.sh
index 00d24310ef56f3ec975489fc692792669f91fcdd..cac18204076b731d7909b6f3dc0b8eaec340fd7f 100755 (executable)
--- a/bin/from-incoming.sh
+++ b/bin/from-incoming.sh
@@ -13,14 +13,14 @@ for i in *uploadinfo; do
                continue
        fi
 
-       srcname=`cat $i|grep '^arch:SRPMS'|cut -d: -f 3`
+       srcname=`cat $i|grep '^file:SRPMS'|cut -d: -f 3`
        if [ -f $FTP_DIR/$DEFAULT_TO/SRPMS/.metadata/$srcname.info ]; then
                # TODO: Do something more interesting here
                continue
        fi
 
        mv $name $FTP_DIR/$DEFAULT_TO/SRPMS/RPMS/
-       echo "arch:SRPMS:$name">$FTP_DIR/$DEFAULT_TO/SRPMS/.metadata/$name.info
+       echo "file:SRPMS:$name">$FTP_DIR/$DEFAULT_TO/SRPMS/.metadata/$name.info
        rm $i
 done
 
@@ -36,15 +36,15 @@ for arch in $ARCHS; do
                        continue
                fi
 
-               srcname=`cat $i|grep '^arch:SRPMS'|cut -d: -f 3`
+               srcname=`cat $i|grep '^file:SRPMS'|cut -d: -f 3`
                if [ ! -f $FTP_DIR/$DEFAULT_TO/SRPMS/.metadata/$srcname.info ]; then
                        # TODO: Do something more interesting here
                        continue
                fi
 
-               for x in `cat $i|grep '^arch:ARCH'|cut -d: -f 3`; do
+               for x in `cat $i|grep '^file:ARCH'|cut -d: -f 3`; do
                        mv $x $FTP_DIR/$DEFAULT_TO/$arch/RPMS/
-                       echo "arch:$arch:$x" >> $FTP_DIR/$DEFAULT_TO/SRPMS/.metadata/$srcname.info
+                       echo "file:$arch:$x" >> $FTP_DIR/$DEFAULT_TO/SRPMS/.metadata/$srcname.info
                done            
 
                rm $i

diff --git a/bin/move.sh b/bin/move.sh
index 1d29a3f872d80ac617fa023920bcee3142c7ac2a..df66cbc3030fa25373cd6eb9284e2e9da36cfa7d 100755 (executable)
--- a/bin/move.sh
+++ b/bin/move.sh
@@ -56,7 +56,7 @@ for srcfile in $files; do
                        continue
                fi
                # Remove all files connected to the old src.rpm (+ the src.rpm itself)
-               for i in `cat $oldinfofile|grep '^arch'`; do
+               for i in `cat $oldinfofile|grep '^file:'`; do
                        arch=`echo $i|cut -d: -f 2`
                        file=`echo $i|cut -d: -f 3`
                        rm "$FTP_DIR/$to/RPMS/$arch/$file"
@@ -70,7 +70,7 @@ done
 cd "$FTP_DIR/$from/SRPMS/.metadata/"
 for srcfile in $files; do
        # Move the rpms
-       for i in `cat "$srcfile.src.rpm.info"|grep '^arch'`; do
+       for i in `cat "$srcfile.src.rpm.info"|grep '^file:'`; do
                arch=`echo $i|cut -d: -f 2`
                file=`echo $i|cut -d: -f 3`
                mv "$FTP_DIR/$from/$arch/RPMS/$file" "$FTP_DIR/$to/$arch/RPMS/"