Send Netdot-devel mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
or, via email, send a message with subject or body 'help' to
[email protected]
You can reach the person managing the list at
[email protected]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Netdot-devel digest..."
Today's Topics:
1. [SCM] Netdot Git repository branch master updated.
netdot-1.0.1-RC3-7-ge807aee (Apache)
2. [SCM] Netdot Git repository branch netdot-1.0 updated.
netdot-1.0.1-RC3-1-g2b18294 (Apache)
3. [SCM] Netdot Git repository branch netdot-1.0 updated.
netdot-1.0.1-RC3-2-ga4d2fb7 (Apache)
----------------------------------------------------------------------
Message: 1
Date: Sat, 14 Jul 2012 17:07:22 -0700
From: Apache <[email protected]>
Subject: [Netdot-devel] [SCM] Netdot Git repository branch master
updated. netdot-1.0.1-RC3-7-ge807aee
To: [email protected]
Message-ID: <[email protected]>
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Netdot Git repository".
The branch, master has been updated
via e807aee30fb9aa017f1d89cf270f56894b94dad0 (commit)
via 00fd9c3e7fa92032a7b903be2d83b6bc9c54d28f (commit)
via d29cd6be4d4c78367394b35a1c0d56d00b1e38e7 (commit)
via e2e530838140ae3353ac101504945693357bb56e (commit)
via 742d7ed65c19923f63a97bf1b6015f301afe6e8c (commit)
via 710375225f8a1c38e8c89fa5c6e329c5f8767c0d (commit)
via 346446078be87630df6410d98d0d202bf35418e3 (commit)
via c6db2539ba8426ac997d7ecdb48462ea80531215 (commit)
via c4542b39aeeb8fdb44d65282cf0b9b5bad47067a (commit)
via ecd0081c15a2458538ef11f56bab9cb02c12d443 (commit)
via 76ba068b58409e4ca9e9ddff8fa1abf6c19fd8b5 (commit)
via ddd451824e9989e2b132db0fcdb0206cec5fe3f8 (commit)
via 019ed86990e7e9c32654771d4b11f5b51a3e7b75 (commit)
via 0891da61ec345f27c7fca68e9f12407c7e41358a (commit)
from a21e7b8322f8e1162461db03048bd8e98e4ac273 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e807aee30fb9aa017f1d89cf270f56894b94dad0
Merge: a21e7b8 00fd9c3
Author: Carlos Vicente <[email protected]>
Date: Fri Jul 13 13:34:56 2012 -0400
Merge branch 'netdot-1.0'
-----------------------------------------------------------------------
Summary of changes:
bin/build_topo_graph.pl | 4 ++--
etc/netdot_apache2_ldap.conf | 6 ++++--
etc/netdot_apache2_local.conf | 5 +++--
etc/netdot_apache2_radius.conf | 5 +++--
htdocs/cable_plant/cable_backbone.html | 4 ----
htdocs/cable_plant/display_sequence.mhtml | 10 ++++++++--
htdocs/management/ip.html | 2 +-
lib/Netdot/AuthLocal.pm | 4 +++-
lib/Netdot/LDAP.pm | 27 +++++++++++++++++++++++++--
lib/Netdot/Model/Device.pm | 12 ++++++------
lib/Netdot/Model/Ipblock.pm | 7 ++++---
lib/Netdot/Topology.pm | 23 +++++++++++++++++++----
upgrade/updatedb | 26 +++++++++++++++++---------
13 files changed, 95 insertions(+), 40 deletions(-)
hooks/post-receive
--
Netdot Git repository
------------------------------
Message: 2
Date: Sat, 14 Jul 2012 17:07:23 -0700
From: Apache <[email protected]>
Subject: [Netdot-devel] [SCM] Netdot Git repository branch netdot-1.0
updated. netdot-1.0.1-RC3-1-g2b18294
To: [email protected]
Message-ID: <[email protected]>
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Netdot Git repository".
The branch, netdot-1.0 has been updated
via 2b18294e6a34f9e794c49a83ba0e53b553806188 (commit)
from 00fd9c3e7fa92032a7b903be2d83b6bc9c54d28f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2b18294e6a34f9e794c49a83ba0e53b553806188
Author: Carlos Vicente <[email protected]>
Date: Sat Jul 14 11:41:03 2012 -0400
Improved way to avoid dulpicate product inserts while upgrading DB
diff --git a/upgrade/Makefile b/upgrade/Makefile
index 99ef586..d5dffb3 100644
--- a/upgrade/Makefile
+++ b/upgrade/Makefile
@@ -11,15 +11,15 @@ all: db tasks
@echo
@echo " * Check the file upgrade/error.log and correct any errors
before continuing"
@echo " * After making sure that errors have been corrected, you may:"
- @echo " * 'make install'"
+ @echo " 'make install'"
@echo " * Stop and start Apache"
@echo
db:
@echo
@echo "Upgrading schema and data..."
- $(PERL) pre_updatedb # Remove after 1.0
- $(PERL) updatedb 2>error.log
+ $(PERL) pre_updatedb 2>error.log # Remove after 1.0
+ $(PERL) updatedb 2>>error.log
tasks:
@echo
diff --git a/upgrade/updatedb b/upgrade/updatedb
index 75e8aa0..c00ae62 100644
--- a/upgrade/updatedb
+++ b/upgrade/updatedb
@@ -143,31 +143,27 @@ foreach my $row ( @$snmods ){
my @ptrow = $dbh->selectrow_array('SELECT id FROM producttype WHERE
name="Module"');
my $ptype = $ptrow[0];
-# Get existing products
-print "DEBUG: Retrieving all products from DB\n" if $CONFIG{debug};
-my $prodq = $dbh->selectall_arrayref('SELECT id,name,manufacturer FROM
product');
-my %all_prods;
-foreach my $row ( @$prodq ){
- my($id,$name,$mf) = @$row;
- $all_prods{$mf}{$name} = $id;
-}
-
my $np = $dbh->prepare('INSERT INTO product (name, manufacturer,type)
VALUES(?,?,?)');
-my %seen_prods; # Try to avoid duplicate errors
foreach my $mf ( keys %products ){
foreach my $model ( keys %{$products{$mf}} ){
- next if exists $all_prods{$mf}{$model};
- next if exists $seen_prods{$mf}{$model};
next if ($model =~ /Fill in/io ); # Ignore bogus values
- $np->execute($model, $mf, $ptype);
- print "DEBUG: Inserted product ($mf, $model)\n" if $CONFIG{debug};
- $seen_prods{$mf}{$model} = 1;
+ eval {
+ $np->execute($model, $mf, $ptype);
+ };
+ if ( my $e = $@ ){
+ if ( $e =~ /duplicate/io ){
+ warn "$e\n";
+ }else{
+ print "DEBUG: Inserted product ($mf, $model)\n" if
$CONFIG{debug};
+ }
+ }
}
}
-# Refresh products hash
+# Get existing products
print "DEBUG: Retrieving all products from DB\n" if $CONFIG{debug};
-$prodq = $dbh->selectall_arrayref('SELECT id,name,manufacturer FROM product');
+my $prodq = $dbh->selectall_arrayref('SELECT id,name,manufacturer FROM
product');
+my %all_prods;
foreach my $row ( @$prodq ){
my($id,$name,$mf) = @$row;
$all_prods{$mf}{$name} = $id;
-----------------------------------------------------------------------
Summary of changes:
upgrade/Makefile | 6 +++---
upgrade/updatedb | 30 +++++++++++++-----------------
2 files changed, 16 insertions(+), 20 deletions(-)
hooks/post-receive
--
Netdot Git repository
------------------------------
Message: 3
Date: Sat, 14 Jul 2012 18:46:20 -0700
From: Apache <[email protected]>
Subject: [Netdot-devel] [SCM] Netdot Git repository branch netdot-1.0
updated. netdot-1.0.1-RC3-2-ga4d2fb7
To: [email protected]
Message-ID: <[email protected]>
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Netdot Git repository".
The branch, netdot-1.0 has been updated
via a4d2fb757791bb8d28ec7c880d50dad8f0db5708 (commit)
from 2b18294e6a34f9e794c49a83ba0e53b553806188 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a4d2fb757791bb8d28ec7c880d50dad8f0db5708
Author: Carlos Vicente <[email protected]>
Date: Sat Jul 14 21:45:51 2012 -0400
Improved way to avoid dulpicate product inserts while upgrading DB
diff --git a/upgrade/updatedb b/upgrade/updatedb
index c00ae62..f563cfc 100644
--- a/upgrade/updatedb
+++ b/upgrade/updatedb
@@ -151,11 +151,9 @@ foreach my $mf ( keys %products ){
$np->execute($model, $mf, $ptype);
};
if ( my $e = $@ ){
- if ( $e =~ /duplicate/io ){
- warn "$e\n";
- }else{
- print "DEBUG: Inserted product ($mf, $model)\n" if
$CONFIG{debug};
- }
+ warn "$e\n";
+ }else{
+ print "DEBUG: Inserted product ($mf, $model)\n" if $CONFIG{debug};
}
}
}
-----------------------------------------------------------------------
Summary of changes:
upgrade/updatedb | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
hooks/post-receive
--
Netdot Git repository
------------------------------
_______________________________________________
Netdot-devel mailing list
[email protected]
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
End of Netdot-devel Digest, Vol 64, Issue 12
********************************************
