From 34ff7dab0c31f4898cc028d834a6355782cc9c93 Mon Sep 17 00:00:00 2001 From: Sergey Matveychuk Date: Mon, 19 Jun 2006 09:54:18 +0000 Subject: - Fix parameter in DBM.open(). It caused the message: Rebuilding the pkgdb in /var/db/pkg ... can't convert String into Integer --- ports-mgmt/portupgrade-devel/Makefile | 2 +- .../portupgrade-devel/files/patch-lib-pkgdb.rb | 25 ++++++++++++++++++++++ ports-mgmt/portupgrade/Makefile | 2 +- ports-mgmt/portupgrade/files/patch-lib-pkgdb.rb | 25 ++++++++++++++++++++++ sysutils/portupgrade-devel/Makefile | 2 +- .../portupgrade-devel/files/patch-lib-pkgdb.rb | 25 ++++++++++++++++++++++ sysutils/portupgrade/Makefile | 2 +- sysutils/portupgrade/files/patch-lib-pkgdb.rb | 25 ++++++++++++++++++++++ 8 files changed, 104 insertions(+), 4 deletions(-) create mode 100644 ports-mgmt/portupgrade-devel/files/patch-lib-pkgdb.rb create mode 100644 ports-mgmt/portupgrade/files/patch-lib-pkgdb.rb create mode 100644 sysutils/portupgrade-devel/files/patch-lib-pkgdb.rb create mode 100644 sysutils/portupgrade/files/patch-lib-pkgdb.rb diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index c2e7fb56e6a2..b9995529b308 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 2.1.4 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ diff --git a/ports-mgmt/portupgrade-devel/files/patch-lib-pkgdb.rb b/ports-mgmt/portupgrade-devel/files/patch-lib-pkgdb.rb new file mode 100644 index 000000000000..ae6a8eb1f95d --- /dev/null +++ b/ports-mgmt/portupgrade-devel/files/patch-lib-pkgdb.rb @@ -0,0 +1,25 @@ +--- lib/pkgdb.rb.orig Mon Jun 19 13:50:29 2006 ++++ lib/pkgdb.rb Mon Jun 19 13:51:35 2006 +@@ -606,17 +606,17 @@ + def get_db(mode, perm) + case db_driver + when :bdb_btree +- db = BDB::Btree.open @db_file, nil, mode, perm, *@db_params ++ db = BDB::Btree.open @db_file, nil, mode.to_i, perm, *@db_params + when :bdb_hash +- db = BDB::Hash.open @db_file, nil, mode, perm, *@db_params ++ db = BDB::Hash.open @db_file, nil, mode.to_i, perm, *@db_params + when :bdb1_btree +- db = BDB1::Btree.open @db_file, mode, perm, *@db_params ++ db = BDB1::Btree.open @db_file, mode.to_i, perm, *@db_params + when :bdb1_hash +- db = BDB1::Hash.open @db_file, mode, perm, *@db_params ++ db = BDB1::Hash.open @db_file, mode.to_i, perm, *@db_params + else + if mode == 'w+' + File.unlink(@db_file) if File.exist?(@db_file) +- db = DBM.open(@db_filebase, mode) ++ db = DBM.open(@db_filebase, mode.to_i) + else + db = DBM.open(@db_filebase) + end diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index c2e7fb56e6a2..b9995529b308 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -7,7 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 2.1.4 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ diff --git a/ports-mgmt/portupgrade/files/patch-lib-pkgdb.rb b/ports-mgmt/portupgrade/files/patch-lib-pkgdb.rb new file mode 100644 index 000000000000..ae6a8eb1f95d --- /dev/null +++ b/ports-mgmt/portupgrade/files/patch-lib-pkgdb.rb @@ -0,0 +1,25 @@ +--- lib/pkgdb.rb.orig Mon Jun 19 13:50:29 2006 ++++ lib/pkgdb.rb Mon Jun 19 13:51:35 2006 +@@ -606,17 +606,17 @@ + def get_db(mode, perm) + case db_driver + when :bdb_btree +- db = BDB::Btree.open @db_file, nil, mode, perm, *@db_params ++ db = BDB::Btree.open @db_file, nil, mode.to_i, perm, *@db_params + when :bdb_hash +- db = BDB::Hash.open @db_file, nil, mode, perm, *@db_params ++ db = BDB::Hash.open @db_file, nil, mode.to_i, perm, *@db_params + when :bdb1_btree +- db = BDB1::Btree.open @db_file, mode, perm, *@db_params ++ db = BDB1::Btree.open @db_file, mode.to_i, perm, *@db_params + when :bdb1_hash +- db = BDB1::Hash.open @db_file, mode, perm, *@db_params ++ db = BDB1::Hash.open @db_file, mode.to_i, perm, *@db_params + else + if mode == 'w+' + File.unlink(@db_file) if File.exist?(@db_file) +- db = DBM.open(@db_filebase, mode) ++ db = DBM.open(@db_filebase, mode.to_i) + else + db = DBM.open(@db_filebase) + end diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile index c2e7fb56e6a2..b9995529b308 100644 --- a/sysutils/portupgrade-devel/Makefile +++ b/sysutils/portupgrade-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 2.1.4 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ diff --git a/sysutils/portupgrade-devel/files/patch-lib-pkgdb.rb b/sysutils/portupgrade-devel/files/patch-lib-pkgdb.rb new file mode 100644 index 000000000000..ae6a8eb1f95d --- /dev/null +++ b/sysutils/portupgrade-devel/files/patch-lib-pkgdb.rb @@ -0,0 +1,25 @@ +--- lib/pkgdb.rb.orig Mon Jun 19 13:50:29 2006 ++++ lib/pkgdb.rb Mon Jun 19 13:51:35 2006 +@@ -606,17 +606,17 @@ + def get_db(mode, perm) + case db_driver + when :bdb_btree +- db = BDB::Btree.open @db_file, nil, mode, perm, *@db_params ++ db = BDB::Btree.open @db_file, nil, mode.to_i, perm, *@db_params + when :bdb_hash +- db = BDB::Hash.open @db_file, nil, mode, perm, *@db_params ++ db = BDB::Hash.open @db_file, nil, mode.to_i, perm, *@db_params + when :bdb1_btree +- db = BDB1::Btree.open @db_file, mode, perm, *@db_params ++ db = BDB1::Btree.open @db_file, mode.to_i, perm, *@db_params + when :bdb1_hash +- db = BDB1::Hash.open @db_file, mode, perm, *@db_params ++ db = BDB1::Hash.open @db_file, mode.to_i, perm, *@db_params + else + if mode == 'w+' + File.unlink(@db_file) if File.exist?(@db_file) +- db = DBM.open(@db_filebase, mode) ++ db = DBM.open(@db_filebase, mode.to_i) + else + db = DBM.open(@db_filebase) + end diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile index c2e7fb56e6a2..b9995529b308 100644 --- a/sysutils/portupgrade/Makefile +++ b/sysutils/portupgrade/Makefile @@ -7,7 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 2.1.4 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ diff --git a/sysutils/portupgrade/files/patch-lib-pkgdb.rb b/sysutils/portupgrade/files/patch-lib-pkgdb.rb new file mode 100644 index 000000000000..ae6a8eb1f95d --- /dev/null +++ b/sysutils/portupgrade/files/patch-lib-pkgdb.rb @@ -0,0 +1,25 @@ +--- lib/pkgdb.rb.orig Mon Jun 19 13:50:29 2006 ++++ lib/pkgdb.rb Mon Jun 19 13:51:35 2006 +@@ -606,17 +606,17 @@ + def get_db(mode, perm) + case db_driver + when :bdb_btree +- db = BDB::Btree.open @db_file, nil, mode, perm, *@db_params ++ db = BDB::Btree.open @db_file, nil, mode.to_i, perm, *@db_params + when :bdb_hash +- db = BDB::Hash.open @db_file, nil, mode, perm, *@db_params ++ db = BDB::Hash.open @db_file, nil, mode.to_i, perm, *@db_params + when :bdb1_btree +- db = BDB1::Btree.open @db_file, mode, perm, *@db_params ++ db = BDB1::Btree.open @db_file, mode.to_i, perm, *@db_params + when :bdb1_hash +- db = BDB1::Hash.open @db_file, mode, perm, *@db_params ++ db = BDB1::Hash.open @db_file, mode.to_i, perm, *@db_params + else + if mode == 'w+' + File.unlink(@db_file) if File.exist?(@db_file) +- db = DBM.open(@db_filebase, mode) ++ db = DBM.open(@db_filebase, mode.to_i) + else + db = DBM.open(@db_filebase) + end -- cgit v1.2.3