[csw-devel] SF.net SVN: gar:[12090] csw/mgar/gar/v2/lib/python
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Mon Dec 27 13:23:45 CET 2010
Revision: 12090
http://gar.svn.sourceforge.net/gar/?rev=12090&view=rev
Author: wahwah
Date: 2010-12-27 12:23:45 +0000 (Mon, 27 Dec 2010)
Log Message:
-----------
checkpkg: Moving DUMP_BIN to common constants
Modified Paths:
--------------
csw/mgar/gar/v2/lib/python/checkpkg.py
csw/mgar/gar/v2/lib/python/common_constants.py
csw/mgar/gar/v2/lib/python/package_stats.py
Modified: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-12-27 12:23:18 UTC (rev 12089)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-12-27 12:23:45 UTC (rev 12090)
@@ -20,7 +20,6 @@
import package_stats
-DUMP_BIN = "/usr/ccs/bin/dump"
PSTAMP_RE = r"(?P<username>\w+)@(?P<hostname>[\w\.-]+)-(?P<timestamp>\d+)"
DESCRIPTION_RE = r"^([\S]+) - (.*)$"
BAD_CONTENT_REGEXES = (
Modified: csw/mgar/gar/v2/lib/python/common_constants.py
===================================================================
--- csw/mgar/gar/v2/lib/python/common_constants.py 2010-12-27 12:23:18 UTC (rev 12089)
+++ csw/mgar/gar/v2/lib/python/common_constants.py 2010-12-27 12:23:45 UTC (rev 12090)
@@ -17,6 +17,7 @@
)
DEFAULT_INSTALL_CONTENTS_FILE = "/var/sadm/install/contents"
+DUMP_BIN = "/usr/ccs/bin/dump"
OWN_PKGNAME_PREFIXES = frozenset(["CSW"])
Modified: csw/mgar/gar/v2/lib/python/package_stats.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_stats.py 2010-12-27 12:23:18 UTC (rev 12089)
+++ csw/mgar/gar/v2/lib/python/package_stats.py 2010-12-27 12:23:45 UTC (rev 12090)
@@ -23,7 +23,6 @@
from sqlobject import sqlbuilder
-DUMP_BIN = "/usr/ccs/bin/dump"
PACKAGE_STATS_VERSION = 9L
BAD_CONTENT_REGEXES = (
# Slightly obfuscating these by using the default concatenation of
@@ -137,7 +136,7 @@
for binary in dir_pkg.ListBinaries():
binary_abs_path = os.path.join(dir_pkg.directory, "root", binary)
binary_base_name = os.path.basename(binary)
- args = [DUMP_BIN, "-Lv", binary_abs_path]
+ args = [common_constants.DUMP_BIN, "-Lv", binary_abs_path]
dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env)
stdout, stderr = dump_proc.communicate()
ret = dump_proc.wait()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list