[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19304 - gnunet-update/gnunet_update
From: |
gnunet |
Subject: |
[GNUnet-SVN] r19304 - gnunet-update/gnunet_update |
Date: |
Sat, 21 Jan 2012 21:09:51 +0100 |
Author: harsha
Date: 2012-01-21 21:09:51 +0100 (Sat, 21 Jan 2012)
New Revision: 19304
Modified:
gnunet-update/gnunet_update/package.py
gnunet-update/gnunet_update/update.py
Log:
fixed external depenendency update
Modified: gnunet-update/gnunet_update/package.py
===================================================================
--- gnunet-update/gnunet_update/package.py 2012-01-21 20:05:03 UTC (rev
19303)
+++ gnunet-update/gnunet_update/package.py 2012-01-21 20:09:51 UTC (rev
19304)
@@ -74,7 +74,7 @@
"""
-def run_configure():
+def run_configure(configure_options):
"""Runs configure on the given source tree."""
#Clean the directory; it may fail if there is no makefile - ignore it
@@ -259,7 +259,7 @@
if "build" == action:
current_dir = os.getcwd()
os.chdir(gnunet_src)
- run_configure()
+ run_configure(configure_options)
run_make()
run_make_install()
os.chdir(current_dir)
Modified: gnunet-update/gnunet_update/update.py
===================================================================
--- gnunet-update/gnunet_update/update.py 2012-01-21 20:05:03 UTC (rev
19303)
+++ gnunet-update/gnunet_update/update.py 2012-01-21 20:09:51 UTC (rev
19304)
@@ -36,7 +36,7 @@
import install_manifest
import metadata
from config import GnunetUpdateConfig
-from file import ExecutableFileObject
+from file import ExecutableFileObject, DependencyFileObject
def usage():
"""Print helpful usage information."""
@@ -230,7 +230,7 @@
dep_tarinfo.name = dep_tarinfo.name.replace("dependencies/","",1)
package_tarfile.extract(dep_tarinfo, "./")
# Check the hash of the extracted file
- if util.sha512_hexdigest(dep_tarinfo.name) != dep.hash:
+ if util.hexdigest(dep_tarinfo.name) != dep.hash:
print (dep_tarinfo.name +
" not matched with the expected hash " + dep.hash)
print "Given package contains code not signed by trusted packager"
@@ -243,9 +243,8 @@
# Generate symbolic link from dep.name to dep.realname
# NOTE: Available only on Unix type systems!
os.symlink(dep.realname, dep.name)
- installed_dep_files.append(DependencyFileObject(dep.name,
- path=None,
- hash=dep.hash))
+ installed_dep_files.append(dep);
+
package_tarfile.close()
# run ldconfig -n in the dep_dir
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19304 - gnunet-update/gnunet_update,
gnunet <=