r11753 - /tools/snapshots/scripts/pkg-gnome-package

[kilian at users.alioth.debian.org]

Author: kilian
Date: Sun Jul  1 16:47:41 2007
New Revision: 11753

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11753
Log:
make sure we can upload properly. 

Modified:
    tools/snapshots/scripts/pkg-gnome-package

Modified: tools/snapshots/scripts/pkg-gnome-package
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/snapshots/scripts/pkg-gnome-package?rev=11753&op=diff
==============================================================================
--- tools/snapshots/scripts/pkg-gnome-package (original)
+++ tools/snapshots/scripts/pkg-gnome-package Sun Jul  1 16:47:41 2007
@@ -228,8 +228,6 @@
         return False
       #else:
       #  print "Tarball valid."
-      if not os.path.isfile(out_dir + package_orig):
-        os.symlink("../tarballs/" + package_orig, out_dir + package_orig)
 
       # continue with linking that tarball where it's needed.
       try:
@@ -285,26 +283,31 @@
             list.append('-sa')
         else:
             list.append('-sd')
-    spawnv_chdir(os.P_WAIT, svn_pkg, list + ['-sa'], package_dir)
+    else:
+      list.append('-sa')
+    spawnv_chdir(os.P_WAIT, svn_pkg, list, package_dir)
+    prefix = '%s_%s%s%s' % (package_name, package_version, version_debian_prefix, version_debian)
     suffices = ['.dsc', '_source.changes']
     if native:
         suffices.append('.tar.gz')
     else:
         suffices.append('.diff.gz')
+        try:
+          os.symlink(base + "/tarballs/" + package_orig, out_dir + '/' + package_orig)
+        except OSError: pass
 
     for suffix in suffices:
-        prefix = '%s_%s%s%s' % (package_name, package_version, version_debian_prefix, version_debian)
         gen = os.path.join(gen_dir, "build-area/%s%s" % (prefix, suffix))
         out = os.path.join(out_dir, "%s%s" % (prefix, suffix))
         os.link(gen, out)
         os.unlink(gen)
 
-    #print "Moved all resulting files to out."
-    file(last_file, 'w').write("%d %s\n" % (revision, version_upstream))
-
     #print "Cleaning up."
     package_storage.remove()
     package_storage._rm(gen_dir + "/build-area")
+
+    #print "Moved all resulting files to out."
+    file(last_file, 'w').write("%d %s\n" % (revision, version_upstream))
 
     #print "Uploading."
     spawnv_chdir(os.P_WAIT, 'dupload', ['dupload', '--to', entry['upload'], '%s_%s%s%s_source.changes' % (package_name, package_version, version_debian_prefix, version_debian)], out_dir)