diff options
| author | Matt Wilson <msw@redhat.com> | 2002-12-19 06:27:47 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2002-12-19 06:27:47 +0000 |
| commit | ca43ff8203b5039ca80b3a12750f43fa8d58bfd3 (patch) | |
| tree | fd88c8bd4f116725a87be79cb76671def06e00ee | |
| parent | e1997739c2759a4df9d99505779c927a09044fbb (diff) | |
| download | anaconda-ca43ff8203b5039ca80b3a12750f43fa8d58bfd3.tar.gz anaconda-ca43ff8203b5039ca80b3a12750f43fa8d58bfd3.tar.xz anaconda-ca43ff8203b5039ca80b3a12750f43fa8d58bfd3.zip | |
don't set __dbi_cdb macros anywhere
| -rw-r--r-- | Makefile.inc | 2 | ||||
| -rw-r--r-- | findpackageset.py | 2 | ||||
| -rw-r--r-- | upgrade.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.inc b/Makefile.inc index 414b87915..808f6a488 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -2,7 +2,7 @@ # define destination locations # VERSION = 8.0.92 -RELEASE = 7 +RELEASE = 8 SNAPRELEASE = $(RELEASE)$(shell date "+.%Y%m%d%H%M") PYTHONLIBDIR = /usr/lib/anaconda diff --git a/findpackageset.py b/findpackageset.py index d3576160b..682f04a6a 100644 --- a/findpackageset.py +++ b/findpackageset.py @@ -3,7 +3,7 @@ import rpm # set DB_PRIVATE to make rpm happy... do it in here since we include # this with all of the useful rpm bits -rpm.addMacro("__dbi_cdb", "create private") +#rpm.addMacro("__dbi_cdb", "create private") def dEBUG(str): diff --git a/upgrade.py b/upgrade.py index 8e80d06a9..bc53821e1 100644 --- a/upgrade.py +++ b/upgrade.py @@ -318,7 +318,7 @@ def upgradeFindPackages(intf, method, id, instPath, dir): rpm.addMacro("_dbapi", "-1") # have to make sure this isn't set, otherwise rpm won't even # *try* to use old-format dbs - rpm.addMacro("__dbi_cdb", "") + #rpm.addMacro("__dbi_cdb", "") rebuildpath = instPath + id.dbpath |