[GNUnet-SVN] r18980 - gnunet-update/gnunet_update

[gnunet]

Author: harsha
Date: 2012-01-04 13:22:14 +0100 (Wed, 04 Jan 2012)
New Revision: 18980

Modified:
   gnunet-update/gnunet_update/package.py
Log:
-fixed library duplicates bug

Modified: gnunet-update/gnunet_update/package.py
===================================================================
--- gnunet-update/gnunet_update/package.py      2012-01-04 11:58:38 UTC (rev 
18979)
+++ gnunet-update/gnunet_update/package.py      2012-01-04 12:22:14 UTC (rev 
18980)
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # This file is part of GNUnet.
-# (C) 2011 Christian Grothoff (and other contributing authors)
+# (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 #
 # GNUnet is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published
@@ -143,6 +143,8 @@
     ignore_files = (config.groups['IGNORE'].matching_files if
                     'IGNORE' in config.groups else list())
 
+    in_house_deps = os.listdir(os.path.join(install_dir, "lib"))
+
     for root, dirs, files in os.walk(install_dir):
         root_rel = os.path.relpath(root, install_dir)
         for file in files:
@@ -186,6 +188,18 @@
                 # Skip over dependency which we include anyway as binary 
objects
                 if dep_data[-1].startswith(os.path.abspath(install_dir)):
                     continue
+                # Skip over dependency which may exist at a different path on
+                # the system but is also included in the package as binary
+                # objects
+                if os.path.basename(dep_data[-1]) in in_house_deps:
+                    # Issue a warning
+                    print ("WARNING: Duplicate dependencies found for " 
+                           + dep_data[0])
+                    print ("Preferring " + 
+                           os.path.join(install_dir, 
+                                        "lib", 
+                                        os.path.basename(dep_data[-1])))
+                    continue
                 #create a new dependency object and add it to the set
                 dep = DependencyFileObject(os.path.basename(dep_data[0]),
                                            os.path.realpath(dep_data[-1]))