[arch-commits] Commit in parted/repos (2 files)

[Giovanni Scafora]

    Date: Wednesday, December 2, 2009 @ 19:25:01
  Author: giovanni
Revision: 60316

Merged revisions 60313 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/parted/trunk

........
  r60313 | giovanni | 2009-12-02 16:20:40 -0800 (mer, 02 dic 2009) | 1 line
  
  cleanup
........

Modified:
  parted/repos/testing-i686/	(properties)
Deleted:
  parted/repos/testing-i686/parted-1.7.1-fix-seg.patch

----------------------------+
 parted-1.7.1-fix-seg.patch |   13 -------------
 1 file changed, 13 deletions(-)


Property changes on: parted/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /parted/trunk:1-60300
   + /parted/trunk:1-60315

Deleted: testing-i686/parted-1.7.1-fix-seg.patch
===================================================================
--- testing-i686/parted-1.7.1-fix-seg.patch	2009-12-03 00:22:47 UTC (rev 60315)
+++ testing-i686/parted-1.7.1-fix-seg.patch	2009-12-03 00:25:01 UTC (rev 60316)
@@ -1,13 +0,0 @@
---- parted-1.7.1/libparted/fs/hfs/probe.c	2006-05-25 13:28:58.000000000 -0400
-+++ parted-1.7.1.new/libparted/fs/hfs/probe.c	2006-06-09 16:58:35.000000000 -0400
-@@ -42,8 +42,9 @@
- {
- 	PedDevice* dev;
- 
-+	dev = geom->dev;
- 	PED_ASSERT (geom != NULL, return 0);
--	PED_ASSERT ((dev = geom->dev) != NULL, return 0);
-+	PED_ASSERT (dev != NULL, return 0);
- 
- 	if (dev->sector_size != PED_SECTOR_SIZE_DEFAULT) {
- 		ped_exception_throw (