[condor] fixed catchup patch, should not patch removed files

[matt]

commit fcdb4c9666f7a66b8150c85b91a386b72afecb0a
Author: Matthew Farrellee <matt at redhat.com>
Date:   Tue Jun 7 09:04:20 2011 -0400

    fixed catchup patch, should not patch removed files

 7.7.0-catch-up.patch |   85 --------------------------------------------------
 1 files changed, 0 insertions(+), 85 deletions(-)
---
diff --git a/7.7.0-catch-up.patch b/7.7.0-catch-up.patch
index 731e3e5..bcfe493 100644
--- a/7.7.0-catch-up.patch
+++ b/7.7.0-catch-up.patch
@@ -111087,91 +111087,6 @@ index 0000000..3f61bd5
 +++ b/src/condor_tests/job_ec2_basic.userDataFile
 @@ -0,0 +1 @@
 +userDataFileExampleData
-diff --git a/src/condor_tests/job_vmu_cdrom.run b/src/condor_tests/job_vmu_cdrom.run
-deleted file mode 100755
-index fb37dab..0000000
---- a/src/condor_tests/job_vmu_cdrom.run
-+++ /dev/null
-@@ -1,67 +0,0 @@
--#!/usr/bin/env perl
--##**************************************************************
--##
--## Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
--## University of Wisconsin-Madison, WI.
--## 
--## Licensed under the Apache License, Version 2.0 (the "License"); you
--## may not use this file except in compliance with the License.  You may
--## obtain a copy of the License at
--## 
--##    http://www.apache.org/licenses/LICENSE-2.0
--## 
--## Unless required by applicable law or agreed to in writing, software
--## distributed under the License is distributed on an "AS IS" BASIS,
--## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--## See the License for the specific language governing permissions and
--## limitations under the License.
--##
--##**************************************************************
--
--use CondorTest;
--use x_vm_utils;
--
--$corename = 'job_vmu_cdrom';
--$testname = 'job_vmu_cdrom';
--$testdesc = 'VM universe CD-ROM test';
--
--x_vm_utils::initialize($corename);
--
--sub create_file_for_iso
--{
--	my $filename = shift;
--	open(FILE, ">$filename") ||
--		die "error opening $filename: $!\n";
--	print FILE "$filename\n" ||
--		die "error writing to $filename\n";
--	close(FILE);
--}
--create_file_for_iso("a.txt");
--create_file_for_iso("b.txt");
--create_file_for_iso("c.txt");
--
--$completed = sub
--{
--	CondorTest::debug("Job has completed\n",1);
--	unless (x_vm_utils::check_output("a.txt b.txt c.txt")) {
--		die "output check failed\n";
--	}
--};
--CondorTest::RegisterExitedSuccess( $testname, $completed );
--
--x_vm_utils::add_submit_command("vmware_should_transfer_files = yes");
--x_vm_utils::add_submit_command("vmware_snapshot_disk = false");
--x_vm_utils::add_submit_command("vm_cdrom_files = a.txt,b.txt,c.txt");
--x_vm_utils::add_submit_command("vm_should_transfer_cdrom_files = yes");
--x_vm_utils::add_submit_command("periodic_remove = (time() - QDate) > 600");
--$success = x_vm_utils::run_test($testname);
--
--x_vm_utils::cleanup();
--
--if( not $success )
--{
--	CondorTest::debug("$corename FAILED\n",1);
--	exit(1);
--}
--CondorTest::debug("$corename SUCCESS\n",1);
--exit(0);
-diff --git a/src/condor_tests/job_vmu_cdrom.sh b/src/condor_tests/job_vmu_cdrom.sh
-deleted file mode 100644
-index 90471bb..0000000
---- a/src/condor_tests/job_vmu_cdrom.sh
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#/bin/sh
--
--mount /dev/hdc /mnt
--echo `cat /mnt/a.txt` `cat /mnt/b.txt` `cat /mnt/c.txt` > /tmp/condorout
--umount /mnt
--dd if=/tmp/condorout of=/dev/fd0
 diff --git a/src/condor_tests/lib_classads.run b/src/condor_tests/lib_classads.run
 index f83ab78..9022428 100755
 --- a/src/condor_tests/lib_classads.run