rpms/kernel/devel/scripts rebase.sh,1.16,1.17

Dave Jones (davej) fedora-extras-commits at redhat.com
Fri Jun 13 19:56:15 UTC 2008


Author: davej

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24937/scripts

Modified Files:
	rebase.sh 
Log Message:
another corner case


Index: rebase.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/rebase.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rebase.sh	13 Jun 2008 19:47:59 -0000	1.16
+++ rebase.sh	13 Jun 2008 19:55:31 -0000	1.17
@@ -135,6 +135,13 @@
   cvs remove patch-2.6.$OLDBASE-rc$OLDRC.bz2.sign
   make download
   make upload FILES=patch-2.6.$NEWBASE-rc$NEWRC.bz2
+
+  # Another awkward (albeit unlikely) corner case.
+  # Moving from say 26-rc3-git1 to 26-rc4-git1
+  # The above will grab the new -rc, but the below will
+  # think that the -git hasn't changed.
+  # Fudge around this, by pretending the old git was something crazy.
+  OLDGIT=99
 fi
 
 if [ "$OLDGIT" != "$NEWGIT" ]; then




More information about the fedora-extras-commits mailing list