From 23a73e8862c814c4c5e4885fabbc944561ceaa65 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Wed, 23 May 2007 00:11:57 +0000
Subject: [PATCH] fix: Importing a package that includes a CS generates
 multiple version tags

---
 docs/changelog/7.x.x.txt   | 1 +
 lib/WebGUI/AssetPackage.pm | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index be319054c..061c0ee58 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -27,6 +27,7 @@
  - fix: spectre fails on Admin.pm because of env_proxy
     http://www.plainblack.com/bugs/tracker/spectre-fails-on-admin.pm-because-of-env_proxy
  - fix: survey in response driven mode sometimes won't terminate correctly
+ - fix: Importing a package that includes a CS generates multiple version tags
 
 
 7.3.17
diff --git a/lib/WebGUI/AssetPackage.pm b/lib/WebGUI/AssetPackage.pm
index 2959fb00e..7b5d5a0ab 100644
--- a/lib/WebGUI/AssetPackage.pm
+++ b/lib/WebGUI/AssetPackage.pm
@@ -147,11 +147,11 @@ sub importAssetData {
 		$asset = WebGUI::Asset->new($self->session, $id, $class);
 		if (defined $asset) { # create a new revision of an existing asset
 			$error->info("Creating a new revision of asset $id");	
-			$asset = $asset->addRevision($data->{properties}, $version);
+			$asset = $asset->addRevision($data->{properties}, $version, {skipAutoCommitWorkflows => 1});
 		}
         else { # add an entirely new asset
 			$error->info("Adding $id that didn't previously exist.");	
-			$asset = $self->addChild($data->{properties}, $id, $version);
+			$asset = $self->addChild($data->{properties}, $id, $version, {skipAutoCommitWorkflows => 1});
 		}
 	}
 	return $asset;