[Debpool-commits] [SCM] Debpool Project Repository branch, master, updated. 0.2.3-63-g38a32aa

[ceros-guest]

The following commit has been merged in the master branch:
commit e95afa2a8ca4ccd714c5bb6207f7cc94ed78f352
Author: ceros-guest <ceros-guest>
Date:   Thu Jan 3 06:11:39 2008 +0000

    Fixed problem with reuploading orig tarballs being rejected even with rollback option set.

diff --git a/bin/debpool b/bin/debpool
index f602f9d..2177e97 100755
--- a/bin/debpool
+++ b/bin/debpool
@@ -342,7 +342,7 @@ foreach $changefile (@changefiles) {
                     $package));
                 
                 if ($has_orig) { # Orig tarball uploaded
-                    if (-e "$pkg_pooldir/$file") {
+                    if ((!$Options{'rollback'}) && (-e "$pkg_pooldir/$file")) {
                         Reject_Package($changefile, $changes_data);
     
                         my($msg) = "Duplicate orig tarball '$file'";
@@ -386,31 +386,31 @@ foreach $changefile (@changefiles) {
             }
         }
     } else { # Assuming a binary only upload
-		# The dsc file should be uploaded
-		my($section) = Guess_Section($changes_data);
-		my($pkg_pooldir) = join('/',
-			($Options{'pool_dir'}, PoolDir($package, $section),
-			$package));
-		my $dsc_check = "$pkg_pooldir/$dscfile";
-		if ( ! -e $dsc_check ) {
-			Reject_Package($changefile, $changes_data);
+        # The dsc file should be uploaded
+        my($section) = Guess_Section($changes_data);
+        my($pkg_pooldir) = join('/',
+            ($Options{'pool_dir'}, PoolDir($package, $section),
+            $package));
+        my $dsc_check = "$pkg_pooldir/$dscfile";
+        if ( ! -e $dsc_check ) {
+            Reject_Package($changefile, $changes_data);
 
             my($msg) = "Attempted to do a binary only upload but the ";
-			$msg .= "source information for this package has not been ";
-			$msg .= "uploaded.";
+            $msg .= "source information for this package has not been ";
+            $msg .= "uploaded.";
             Log_Message($msg, LOG_REJECT, LOG_ERROR);
 
             $rejected = 1;
             last; # Don't check other files, we just rejected
-		}
-		foreach $filehr (@{$changes_data->{'Files'}}) {
-			my($file) = $filehr->{'Filename'};
-			if (!(Verify_MD5($file, $filehr->{'MD5Sum'}))) {
+        }
+        foreach $filehr (@{$changes_data->{'Files'}}) {
+            my($file) = $filehr->{'Filename'};
+            if (!(Verify_MD5($file, $filehr->{'MD5Sum'}))) {
                 $valid = undef;
                 last; # Don't check other files, we failed
             }
-		}
-	} # TODO: Will this work for a binNMU?
+        }
+    } # TODO: Will this work for a binNMU?
 
     next if ($rejected); # Reject message already logged, go to next package.
 
diff --git a/debian/changelog b/debian/changelog
index e028740..93e6782 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-debpool (0.2.4~0unreleased) expiremental; urgency=low
+debpool (0.2.4~unreleased0) expiremental; urgency=low
 
   [ Andres Mejia ]
+  * Added myself as an uploader.
   * Added udeb support. Thanks Free Ekanayaka. Closes: #245526
   * Fixed problem with packages with multiple '+' characters. Fixes part of bug
     322593.
@@ -45,8 +46,11 @@ debpool (0.2.4~0unreleased) expiremental; urgency=low
     + Thanks Magnus Holmgren.
   * Allow Release files to generate SHA256 checksums as well.
     + Needs libdigest-sha-perl so changed debian/control accordingly.
+  * Fixed problem where reuploading an orig tarball would be rejected
+    even with the 'rollback' option set.
+  * Bumped Standards-Version to 3.7.3.
 
- -- Andres Mejia <mcitadel at gmail.com>  Mon, 17 Dec 2007 14:24:54 -0500
+ -- Andres Mejia <mcitadel at gmail.com>  Thu, 03 Jan 2008 00:58:20 -0500
 
 debpool (0.2.3) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 3fc6ddc..66083d8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: debpool
 Section: devel
 Priority: extra
 Maintainer: Joel Aelwyn <fenton at debian.org>
-Standards-Version: 3.7.2.0
+Uploaders: Andres Mejia <mcitadel at gmail.com>
+Standards-Version: 3.7.3
 Build-Depends: debhelper (>= 4)
 Vcs-SVN: svn://svn.debian.org/svn/debpool
 Vcs-Browser: http://svn.debian.org/wsvn/debpool/?op=log

-- 
Debpool Project Repository