summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpjmattal <pjmattal>2005-01-22 06:52:26 +0000
committerpjmattal <pjmattal>2005-01-22 06:52:26 +0000
commitedfde9187cf26224eb508963a5b5362c90b70a0c (patch)
treede77796ea54ad872e7dfd7ff936a51efb490987e
parent28e23308d4e15c8883b8c36b24e4395487004d95 (diff)
old changes; fixed one subtle handling where there's no new package
but no update, so it's okay
-rwxr-xr-xtupkg/update/tupkgupdate8
1 files changed, 5 insertions, 3 deletions
diff --git a/tupkg/update/tupkgupdate b/tupkg/update/tupkgupdate
index 7020d88..0104ab5 100755
--- a/tupkg/update/tupkgupdate
+++ b/tupkg/update/tupkgupdate
@@ -228,7 +228,8 @@ for c_file in c_files:
#
# Go through the package collection
# 1 - if package has no new, place its old file on the "delete" list
-# 2 - if package has a new but no new.file, error and skip
+# 2 - if package has a new but no new.file, and old file doesn't
+# have the same version, then error and skip
# 3 - if package has no old, add new file to "copy" list into repo dir
# 4 - if old > new, error and skip
# 5 - if new == old, compare them and error and skip if files not the same
@@ -243,8 +244,9 @@ for package in packages.values():
# 2
if (package.new.file == None):
- error("No new package supplied for " + package.name + " " + package.new.version + "!")
- continue
+ if (package.old.file == None or package.old.version != package.new.version):
+ error("No new package supplied for " + package.name + " " + package.new.version + "!")
+ continue
# 3
if (package.old == None):