1.1 --- a/librazor/root.c	Fri Jun 20 15:10:34 2008 -0400
     1.2 +++ b/librazor/root.c	Fri Jun 20 20:57:51 2008 -0400
     1.3 @@ -68,7 +68,7 @@
     1.4  }
     1.5  
     1.6  struct razor_root *
     1.7 -razor_root_open(const char *root, int flags)
     1.8 +razor_root_open(const char *root)
     1.9  {
    1.10  	struct razor_root *image;
    1.11  
    1.12 @@ -118,20 +118,19 @@
    1.13  	return razor_set_open(path);
    1.14  }
    1.15  
    1.16 -struct razor_transaction *
    1.17 -razor_root_create_transaction(struct razor_root *image,
    1.18 -			      struct razor_set *upstream)
    1.19 +struct razor_set *
    1.20 +razor_root_get_system_set(struct razor_root *root)
    1.21  {
    1.22 -	/* FIXME: This should take a number of upstream repos. */
    1.23 -	return razor_transaction_create(image->system, upstream);
    1.24 +	return root->system;
    1.25  }
    1.26  
    1.27  int
    1.28 -razor_root_close(struct razor_root *image)
    1.29 +razor_root_close(struct razor_root *root)
    1.30  {
    1.31 -	unlink(image->new_path);
    1.32 -	close(image->fd);
    1.33 -	free(image);
    1.34 +	razor_set_destroy(root->system);
    1.35 +	unlink(root->new_path);
    1.36 +	close(root->fd);
    1.37 +	free(root);
    1.38  
    1.39  	return 0;
    1.40  }
    1.41 @@ -149,20 +148,14 @@
    1.42  }
    1.43  
    1.44  int
    1.45 -razor_root_commit(struct razor_root *image)
    1.46 +razor_root_commit(struct razor_root *root)
    1.47  {
    1.48  	/* Make it so. */
    1.49 -	rename(image->new_path, image->path);
    1.50 -	printf("renamed %s to %s\n", image->new_path, image->path);
    1.51 -	close(image->fd);
    1.52 -	free(image);
    1.53 +	rename(root->new_path, root->path);
    1.54 +	printf("renamed %s to %s\n", root->new_path, root->path);
    1.55 +	razor_set_destroy(root->system);
    1.56 +	close(root->fd);
    1.57 +	free(root);
    1.58  
    1.59  	return 0;
    1.60  }
    1.61 -
    1.62 -void
    1.63 -razor_root_diff(struct razor_root *root,
    1.64 -		razor_package_callback_t callback, void *data)
    1.65 -{
    1.66 -	return razor_set_diff(root->system, root->next, callback, data);
    1.67 -}