--- smeserver-subversion-1.4/root/etc/e-smith/db/accounts/migrate/80subversionUsers.migratefix	2008-03-01 15:40:22.000000000 -0700
+++ smeserver-subversion-1.4/root/etc/e-smith/db/accounts/migrate/80subversionUsers	2008-03-01 15:40:02.000000000 -0700
@@ -1,25 +1,10 @@
 {
-    use define PROPERTY       => 'Users';
-    use define PROPERTY_WRITE => 'UsersWrite';
-    use define PROPERTY_READ  => 'UsersRead';
-
-    my @repositories = $DB->get_all_by_prop('type' => 'repository');
-
-    REPOSITORY: foreach my $repository (
-        (@repositories),
-    )
+    foreach my $repository ($DB->get_all_by_prop('type' => 'repository'))
     {
+        my $property = $DB->get_prop_and_delete($repository->key, 'Users') or next;
 
-        my $key = $repository->key;
-
-        my $rec = $DB->get($key) or next REPOSITORY;
-
-        my $property = $DBB->get_prop_and_delete($key, PROPERTY) or next REPOSITORY;
-
-        # Migrating existing properties to new ones to keep functionality
-        $rec->merge_prop(PROPERTY_WRITE, $property);
-        $rec->merge_prop(PROPERTY_READ, $property);
+        $repository->merge_prop('UsersWrite', $property) unless $repository->prop('UsersWrite');
+        $repository->merge_prop('UsersRead', $property) unless $repository->prop('UsersRead');
 
     }
-
 }
--- smeserver-subversion-1.4/root/etc/e-smith/db/accounts/migrate/80subversionGroups.migratefix	2008-03-01 15:40:22.000000000 -0700
+++ smeserver-subversion-1.4/root/etc/e-smith/db/accounts/migrate/80subversionGroups	2008-03-01 15:39:36.000000000 -0700
@@ -1,25 +1,10 @@
 {
-    use define PROPERTY       => 'Groups';
-    use define PROPERTY_WRITE => 'GroupsWrite';
-    use define PROPERTY_READ  => 'GroupsRead';
-
-    my @repositories = $DB->get_all_by_prop('type' => 'repository');
-
-    REPOSITORY: foreach my $repository (
-        (@repositories),
-    )
+    foreach my $repository ($DB->get_all_by_prop('type' => 'repository'))
     {
+        my $property = $DB->get_prop_and_delete($repository->key, 'Groups') or next;
 
-        my $key = $repository->key;
-
-        my $rec = $DB->get($key) or next REPOSITORY;
-
-        my $property = $DBB->get_prop_and_delete($key, PROPERTY) or next REPOSITORY;
-
-        # Migrating existing properties to new ones to keep functionality
-        $rec->merge_prop(PROPERTY_WRITE, $property);
-        $rec->merge_prop(PROPERTY_READ, $property);
+        $repository->merge_prop('GroupsWrite', $property) unless $repository->prop('GroupsWrite');
+        $repository->merge_prop('GroupsRead', $property) unless $repository->prop('GroupsRead');
 
     }
-
 }