PDA

View Full Version : Migration.php - which version is more recent?



wsanders
September 20th, 2010, 03:57 PM
I am upgrading ZEE on Solaris from 3.0.2 to 3.1.2. There are two data Migration tools, one that was installed with Zmanda 3.1.2, the other is posted in a separate tarball in the downloads section.

The one installed with Zmanda is dated 2010-08-04 and is 12741 bytes.
The tarball is named "Migration.07082010.tar", so is it dated 07-08-2010, or 08-07-2010? It has not version info, it is 12775 bytes.

Which one should I use? Here are the diffs:


-bash-3.00# diff Migration.php-from07082010tarball /opt/zmanda/amanda/apache2/htdocs/zmanda-aee/ZMC/BackupSet/Migration.php
1c1
< <?/* $Id$ */
---
> <?/* $Id: Migration.php 23264 2010-08-04 21:41:50Z gavin $ */
10c10
< if (self::dumpTypesModified($pm))
---
> if (ZMC_Login_Aee::dumpTypesInstalled($pm))
77a78,85
> $disklistFilenameOld = current(glob($confDir . 'disklist.conf'));
> if (empty($bindingFilenameOld))
> {
> $pm->addError("Unable to find $disklistFilenameOld. If a backup set has no device binding (and therefore no backups), then create a new backup set, instead of trying to migrate the old backup set.");
> return;
> }
> $disklistFilename = $bakDir . 'disklist.conf';
>
109a118
> copy($disklistFilenameOld, $disklistFilename);
285,286c294
< $copy = $pm->getArrayCopy(); // PHP 5.2.x can't serialize ArrayObject's correctly
< unset($copy['edit']);
---
> $copy = $pm->getAllMerged(); // PHP 5.2.x can't serialize ArrayObject's correctly
305,316d312
< public static function dumpTypesModified($pm)
< {
< foreach(array('rpmsave', 'dpkg-dist') as $suffix)
< {
< $rpmsave = str_replace('device_profiles/', 'zmc_dumptypes.' . $suffix, ZMC::$registry->zmc_devices);
< if (file_exists($rpmsave) || file_exists(str_replace('_', '_user_', $rpmsave)))
< return $pm->addEscapedError('Please contact Zmanda Customer Support at <a href="mailto:support@zmanda.com">support@zmanda.com</a> to complete the AEE software upgrade (code #ZD).');
< }
<
< return false;
< }
<