rpms/kernel/devel/scripts rebase.sh,1.6,1.7
Jarod Wilson (jwilson)
fedora-extras-commits at redhat.com
Mon Aug 13 14:04:52 UTC 2007
Author: jwilson
Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26160
Modified Files:
rebase.sh
Log Message:
Fix another little quirk in rebase.sh when moving to a new rc
Index: rebase.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/rebase.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rebase.sh 5 Aug 2007 02:58:03 -0000 1.6
+++ rebase.sh 13 Aug 2007 14:04:20 -0000 1.7
@@ -81,9 +81,12 @@
fi
perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ $ENV{"NEWGIT"}/' kernel.spec
if [ "$OLDGIT" -ne 0 ]; then
- perl -p -i -e 's/$ENV{OLD}/$ENV{NEW}/' .cvsignore
- perl -p -i -e 's/$ENV{OLD}/$ENV{NEW}/' upstream
+ if [ "$NEWGIT" -ne 0 ]; then
+ perl -p -i -e 's/$ENV{OLD}/$ENV{NEW}/' .cvsignore
+ perl -p -i -e 's/$ENV{OLD}/$ENV{NEW}/' upstream
+ fi
grep -v patch-$OLD.bz2 sources > .sources.tmp; mv .sources.tmp sources
+ grep -v patch-$OLD.bz2 upstream > .upstream.tmp; mv .upstream.tmp upstream
else
echo patch-$NEW.bz2 >> .cvsignore
echo patch-$NEW.bz2 >> upstream
More information about the scm-commits
mailing list