tags 702769 + patch
tags 702769 + pending
thanks

Hello,

After  comparing the  changes  in  bup between  the  current version  in
unstable and the one in experimental, I found that the FTBFS is due to a
change in Git and has been fixed upstream by this commit:

https://github.com/bup/bup/commit/9269e652b57947c6a518d0b544f9df0cb933385f

I modified a bit this patch reverting  "user %d" to "user%d" as this bit
has been  reverted in a later  commit anyway and the  current version of
bup also uses "user%d":

https://github.com/bup/bup/commit/4875d0cb42eb66c3ac7f0297e0cb7aca6d4f3975

Therefore,   I've    prepared   an    NMU   for   bup    (versioned   as
0.25~git2011.11.04-5.1) and uploaded it  to DELAYED/5.  Please feel free
to tell me if I should delay it longer.

Regards,
Arnaud Fontaine

diff -Nru bup-0.25~git2011.11.04/debian/changelog 
bup-0.25~git2011.11.04/debian/changelog
--- bup-0.25~git2011.11.04/debian/changelog     2012-05-25 19:55:17.000000000 
+0900
+++ bup-0.25~git2011.11.04/debian/changelog     2013-03-18 16:57:28.000000000 
+0900
@@ -1,3 +1,12 @@
+bup (0.25~git2011.11.04-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Recent version of Git expects that the commit username is not empty,
+    whereas bup was using GECOS field which may be empty, thus tests
+    executed at build time were broken. Closes: #702769.
+
+ -- Arnaud Fontaine <ar...@debian.org>  Mon, 18 Mar 2013 16:49:50 +0900
+
 bup (0.25~git2011.11.04-5) unstable; urgency=low
 
   * Add 0.22a-1 changelog entry to this file. Remove changelog
diff -Nru bup-0.25~git2011.11.04/debian/patches/debian-changes 
bup-0.25~git2011.11.04/debian/patches/debian-changes
--- bup-0.25~git2011.11.04/debian/patches/debian-changes        2012-05-30 
07:07:54.000000000 +0900
+++ bup-0.25~git2011.11.04/debian/patches/debian-changes        2013-03-18 
16:58:54.000000000 +0900
@@ -299,3 +299,21 @@
              self.inprogress = None
          except Exception, e:
              it.abort()
+--- bup-0.25~git2011.11.04.orig/lib/bup/helpers.py
++++ bup-0.25~git2011.11.04/lib/bup/helpers.py
+@@ -231,9 +231,13 @@ def userfullname():
+     if not _userfullname:
+         uid = os.getuid()
+         try:
+-            _userfullname = pwd.getpwuid(uid)[4].split(',')[0]
++            entry = pwd.getpwuid(uid)
++            _userfullname = entry[4].split(',')[0] or entry[0]
+         except KeyError:
+-            _userfullname = 'user%d' % uid
++            pass
++        finally:
++            if not _userfullname:
++              _userfullname = 'user%d' % uid
+     return _userfullname
+ 
+ 


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to